Sugo db2 support

docs/data-types.md

@@ -229,13 +229,14 @@ modules.exports = function sequelizeAdditions(Sequelize) {
     }
   }
 
+  DataTypes.NEWTYPE = NEWTYPE;
+
   // Mandatory, set key
   DataTypes.NEWTYPE.prototype.key = DataTypes.NEWTYPE.key = 'NEWTYPE'
 
-
   // Optional, disable escaping after stringifier. Not recommended.
   // Warning: disables Sequelize protection against SQL injections
-  //DataTypes.NEWTYPE.escape = false
+  // DataTypes.NEWTYPE.escape = false
 
   // For convenience
   // `classToInvokable` allows you to use the datatype without `new`

docs/hooks.md

@@ -186,11 +186,13 @@ new Sequelize(..., {
 
 ### Connection Hooks
 
-Sequelize provides two hooks that are executed immediately before and after a database connection is obtained:
+Sequelize provides four hooks that are executed immediately before and after a database connection is obtained or released:
 
 ```text
 beforeConnect(config)
 afterConnect(connection, config)
+beforeDisconnect(connection)
+afterDisconnect(connection)
 ```
 
 These hooks can be useful if you need to asynchronously obtain database credentials, or need to directly access the low-level database connection after it has been created.

docs/migrations.md

@@ -139,7 +139,9 @@ module.exports = {
     return queryInterface.bulkInsert('Users', [{
         firstName: 'John',
         lastName: 'Doe',
-        email: '[email protected]'
+        email: '[email protected]',
+        createdAt: Date.now(),
+        updatedAt: Date.now()
       }], {});
   },
 

docs/models-definition.md

@@ -71,7 +71,7 @@ Foo.init({
    }
  },
 
- // It is possible to add coments on columns for MySQL, PostgreSQL and MSSQL only
+ // It is possible to add comments on columns for MySQL, PostgreSQL and MSSQL only
  commentMe: {
    type: Sequelize.INTEGER,
 
@@ -710,7 +710,7 @@ User.init({}, {
       }
     },
 
-    // A BTREE index with a ordered field
+    // A BTREE index with an ordered field
     {
       name: 'title_index',
       using: 'BTREE',

docs/models-usage.md

@@ -36,6 +36,8 @@ The method `findOrCreate` can be used to check if a certain element already exis
 
 Let's assume we have an empty database with a `User` model which has a `username` and a `job`.
 
+`where` option will be appended to `defaults` for create case.
+
 ```js
 User
   .findOrCreate({where: {username: 'sdepold'}, defaults: {job: 'Technical Lead JavaScript'}})

lib/dialects/abstract/connection-manager.js

@@ -320,7 +320,9 @@ class ConnectionManager {
    * @returns {Promise}
    */
   _disconnect(connection) {
-    return this.dialect.connectionManager.disconnect(connection);
+    return this.sequelize.runHooks('beforeDisconnect', connection)
+      .then(() => this.dialect.connectionManager.disconnect(connection))
+      .then(() => this.sequelize.runHooks('afterDisconnect', connection));
   }
 
   /**

lib/dialects/abstract/query-generator.js

@@ -36,9 +36,6 @@ class QueryGenerator {
     // dialect name
     this.dialect = options._dialect.name;
     this._dialect = options._dialect;
-
-    // template config
-    this._templateSettings = require('lodash').runInContext().templateSettings;
   }
 
   extractTableDetails(tableName, options) {
@@ -111,9 +108,9 @@ class QueryGenerator {
     const quotedTable = this.quoteTable(table);
     const bindParam = options.bindParam === undefined ? this.bindParam(bind) : options.bindParam;
     let query;
-    let valueQuery = `<%= tmpTable %>INSERT<%= ignoreDuplicates %> INTO ${quotedTable} (<%= attributes %>)<%= output %> VALUES (<%= values %>)<%= onConflictDoNothing %>`;
-    let emptyQuery = `<%= tmpTable %>INSERT<%= ignoreDuplicates %> INTO ${quotedTable}<%= output %><%= onConflictDoNothing %>`;
-    let outputFragment;
+    let valueQuery = '';
+    let emptyQuery = '';
+    let outputFragment = '';
     let identityWrapperRequired = false;
     let tmpTable = '';         //tmpTable declaration for trigger
 
@@ -180,25 +177,6 @@ class QueryGenerator {
     if (this._dialect.supports.EXCEPTION && options.exception) {
       // Not currently supported with bind parameters (requires output of multiple queries)
       options.bindParam = false;
-      // Mostly for internal use, so we expect the user to know what he's doing!
-      // pg_temp functions are private per connection, so we never risk this function interfering with another one.
-      if (semver.gte(this.sequelize.options.databaseVersion, '9.2.0')) {
-        // >= 9.2 - Use a UUID but prefix with 'func_' (numbers first not allowed)
-        const delimiter = `$func_${uuidv4().replace(/-/g, '')}$`;
-
-        options.exception = 'WHEN unique_violation THEN GET STACKED DIAGNOSTICS sequelize_caught_exception = PG_EXCEPTION_DETAIL;';
-        valueQuery = `${`CREATE OR REPLACE FUNCTION pg_temp.testfunc(OUT response ${quotedTable}, OUT sequelize_caught_exception text) RETURNS RECORD AS ${delimiter}` +
-          ' BEGIN '}${valueQuery} INTO response; EXCEPTION ${options.exception} END ${delimiter
-        } LANGUAGE plpgsql; SELECT (testfunc.response).*, testfunc.sequelize_caught_exception FROM pg_temp.testfunc(); DROP FUNCTION IF EXISTS pg_temp.testfunc()`;
-      } else {
-        options.exception = 'WHEN unique_violation THEN NULL;';
-        valueQuery = `CREATE OR REPLACE FUNCTION pg_temp.testfunc() RETURNS SETOF ${quotedTable} AS $body$ BEGIN RETURN QUERY ${valueQuery}; EXCEPTION ${options.exception} END; $body$ LANGUAGE plpgsql; SELECT * FROM pg_temp.testfunc(); DROP FUNCTION IF EXISTS pg_temp.testfunc();`;
-      }
-    }
-
-    if (this._dialect.supports['ON DUPLICATE KEY'] && options.onDuplicate) {
-      valueQuery += ` ON DUPLICATE KEY ${options.onDuplicate}`;
-      emptyQuery += ` ON DUPLICATE KEY ${options.onDuplicate}`;
     }
 
     valueHash = Utils.removeNullValuesFromHash(valueHash, this.options.omitNull);
@@ -239,6 +217,31 @@ class QueryGenerator {
       tmpTable
     };
 
+    valueQuery = `${tmpTable}INSERT${replacements.ignoreDuplicates} INTO ${quotedTable} (${replacements.attributes})${replacements.output} VALUES (${replacements.values})${replacements.onConflictDoNothing}${valueQuery}`;
+    emptyQuery = `${tmpTable}INSERT${replacements.ignoreDuplicates} INTO ${quotedTable}${replacements.output}${replacements.onConflictDoNothing}${emptyQuery}`;
+
+    if (this._dialect.supports.EXCEPTION && options.exception) {
+      // Mostly for internal use, so we expect the user to know what he's doing!
+      // pg_temp functions are private per connection, so we never risk this function interfering with another one.
+      if (semver.gte(this.sequelize.options.databaseVersion, '9.2.0')) {
+        // >= 9.2 - Use a UUID but prefix with 'func_' (numbers first not allowed)
+        const delimiter = `$func_${uuidv4().replace(/-/g, '')}$`;
+
+        options.exception = 'WHEN unique_violation THEN GET STACKED DIAGNOSTICS sequelize_caught_exception = PG_EXCEPTION_DETAIL;';
+        valueQuery = `${`CREATE OR REPLACE FUNCTION pg_temp.testfunc(OUT response ${quotedTable}, OUT sequelize_caught_exception text) RETURNS RECORD AS ${delimiter}` +
+        ' BEGIN '}${valueQuery} INTO response; EXCEPTION ${options.exception} END ${delimiter
+        } LANGUAGE plpgsql; SELECT (testfunc.response).*, testfunc.sequelize_caught_exception FROM pg_temp.testfunc(); DROP FUNCTION IF EXISTS pg_temp.testfunc()`;
+      } else {
+        options.exception = 'WHEN unique_violation THEN NULL;';
+        valueQuery = `CREATE OR REPLACE FUNCTION pg_temp.testfunc() RETURNS SETOF ${quotedTable} AS $body$ BEGIN RETURN QUERY ${valueQuery}; EXCEPTION ${options.exception} END; $body$ LANGUAGE plpgsql; SELECT * FROM pg_temp.testfunc(); DROP FUNCTION IF EXISTS pg_temp.testfunc();`;
+      }
+    }
+
+    if (this._dialect.supports['ON DUPLICATE KEY'] && options.onDuplicate) {
+      valueQuery += ` ON DUPLICATE KEY ${options.onDuplicate}`;
+      emptyQuery += ` ON DUPLICATE KEY ${options.onDuplicate}`;
+    }
+
     query = `${replacements.attributes.length ? valueQuery : emptyQuery};`;
     if (this._dialect.supports.finalTable) {
       query = `SELECT * FROM FINAL TABLE(${ replacements.attributes.length ? valueQuery : emptyQuery });`;
@@ -247,7 +250,6 @@ class QueryGenerator {
       query = `SET IDENTITY_INSERT ${quotedTable} ON; ${query} SET IDENTITY_INSERT ${quotedTable} OFF;`;
     }
 
-    query = _.template(query, this._templateSettings)(replacements);
     // Used by Postgres upsertQuery and calls to here with options.exception set to true
     const result = { query };
     if (options.bindParam !== false) {
@@ -2122,7 +2124,10 @@ class QueryGenerator {
       }
     }
 
-    if (key === Op.or || key === Op.and || key === Op.not) {
+    if (key === Op.or || key === Op.and || key === Op.not) {  
+      if (key === Op.or) {
+        options.hasOr = true;
+      }
       return this._whereGroupBind(key, value, options);
     }
 
@@ -2531,6 +2536,7 @@ class QueryGenerator {
   }
 }
 
+// Object.assign(QueryGenerator.prototype, require('../db2/query-generator/operators'));
 Object.assign(QueryGenerator.prototype, require('./query-generator/operators'));
 Object.assign(QueryGenerator.prototype, require('./query-generator/transaction'));
 

lib/dialects/db2/data-types.js

@@ -48,6 +48,7 @@ module.exports = BaseTypes => {
   BaseTypes.ENUM.types.db2 = ['VARCHAR'];
   BaseTypes.REAL.types.db2 = ['REAL'];
   BaseTypes.DOUBLE.types.db2 = ['DOUBLE'];
+  BaseTypes.JSON.types.db2 = ['JSON', 'JSONB'];
   BaseTypes.GEOMETRY.types.db2 = false;
 
   class BLOB extends BaseTypes.BLOB {
@@ -86,6 +87,29 @@ module.exports = BaseTypes => {
     }
   }
 
+  class JSONTYPE extends BaseTypes.JSON {
+    toSql() {
+      return 'CLOB(32672)';
+    }
+    _stringify(value) {
+      return JSON.stringify(value);
+    }
+
+    defaultType() {
+      return 'JSON';
+    }
+
+    static parse(value) {
+      return JSON.parse(value);
+    }
+  }
+
+  class JSONB extends BaseTypes.JSON {
+    defaultType() {
+      return 'JSONB';
+    }
+  }
+
   class STRING extends BaseTypes.STRING {
     toSql() {
       if (!this._binary) {
@@ -134,7 +158,7 @@ module.exports = BaseTypes => {
         }
         if (len > 0 ) { this._length = len; }
       } else {  this._length = 32672; }
-      if ( this._length > 32672 )
+      if ( this._length > 4000 )
       {
         len = `CLOB(${  this._length  })`;
       }
@@ -149,7 +173,7 @@ module.exports = BaseTypes => {
 
   class BOOLEAN extends BaseTypes.BOOLEAN {
     toSql() {
-      return 'BOOLEAN';
+      return 'INTEGER';
     }
     _sanitize(value) {
       if (value !== null && value !== undefined) {
@@ -171,6 +195,10 @@ module.exports = BaseTypes => {
 
       return value;
     }
+
+    defaultType() {
+      return 'BOOLEAN';
+    }
   }
   BOOLEAN.parse = BOOLEAN.prototype._sanitize;
 
@@ -213,6 +241,10 @@ module.exports = BaseTypes => {
       value = new Date(moment.utc(value));
       return value;
     }
+
+    // defaultType () {
+    //   return 'DATE'
+    // }
   }
 
   class DATEONLY extends BaseTypes.DATEONLY {
@@ -330,6 +362,8 @@ module.exports = BaseTypes => {
     BIGINT,
     REAL,
     FLOAT,
-    TEXT
+    TEXT,
+    JSON: JSONTYPE,
+    JSONB
   };
 };