@vida-global/core 2.0.8 → 2.0.9

package/lib/activeRecord/db/migrator.js

@@ -128,11 +128,12 @@ class Migrator {
     }
 
 
-    async addIndex(tableName, fields, { concurrently, unique, name, where }) {
+    async addIndex(tableName, fields, { concurrently, unique, name, using, where }) {
         const options = {fields: fields};
         if (concurrently) options.concurrently = true;
         if (unique)       options.unique       = true;
         if (name)         options.name         = name;
+        if (using)        options.using        = using;
         if (where)        options.where        = where;
 
         await this.#sequelizeQueryInterface.addIndex(tableName, options);

package/lib/activeRecord/db/schema.js

@@ -81,6 +81,7 @@ function cleanSchema(schema, dialect) {
         const dataType = dataTypeForColumn(details, dialect);
         if (dataType) details.type = dataType;
         resolveAutoIncrementColumns(details);
+        resolveTimestampDefaults(details, dialect);
         resolveUUIDColumns(details);
     }
 }
@@ -97,6 +98,15 @@ function resolveAutoIncrementColumns(details) {
 }
 
 
+function resolveTimestampDefaults(details, dialect) {
+    if (dialect != 'postgres') return;
+    if (details.type != Sequelize.DataTypes.DATE) return;
+    if (!/^(now\(\)|CURRENT_TIMESTAMP)$/i.test(details.defaultValue)) return;
+
+    details.defaultValue = Sequelize.NOW;
+}
+
+
 function dataTypeForColumn(details, dialect) {
     const typeStr         = details.type.replace(/\(.*\)/, '').toUpperCase();
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vida-global/core",
-    "version": "2.0.8",
+    "version": "2.0.9",
     "description": "Core libraries for supporting Vida development",
     "author": "",
     "license": "ISC",

package/test/activeRecord/db/migrator.test.js

@@ -102,7 +102,7 @@ describe('Migrator', () => {
 
     describe('Migrator#addIndex', () => {
         it.each([
-            ['all supported options', { concurrently: true, unique: true, where: {}, name: 'foo' }],
+            ['all supported options', { concurrently: true, unique: true, where: {}, name: 'foo', using: 'gin' }],
             ['empty options', {}],
             ['falsey options', { concurrently: false, unique: false, where: null, name: null }],
         ])('builds addIndex options for %s', async (_label, options) => {
@@ -114,6 +114,7 @@ describe('Migrator', () => {
             if (options.unique) expectedOptions.unique = true;
             if (options.where) expectedOptions.where = options.where;
             if (options.name) expectedOptions.name = options.name;
+            if (options.using) expectedOptions.using = options.using;
 
             await Helpers.migrator.addIndex(tableName, fields, options);
 

package/test/activeRecord/db/schema.test.js

@@ -154,6 +154,32 @@ describe('activeRecord/db/schema', () => {
                 expect(schema.id.defaultValue).toBeUndefined();
             });
         });
+
+
+        describe('timestamp default resolution', () => {
+            it.each(['now()', 'CURRENT_TIMESTAMP'])(
+                'maps PostgreSQL %s defaults to Sequelize.NOW',
+                (defaultValue) => {
+                    importSchema.mockImplementation(() => ({
+                        created_at: { type: 'TIMESTAMP WITH TIME ZONE', defaultValue }
+                    }));
+
+                    const schema = getActiveRecordSchema('t', 'main', 'postgres');
+
+                    expect(schema.created_at.defaultValue).toBe(Sequelize.NOW);
+                }
+            );
+
+            it ('does not rewrite SQLite timestamp defaults', () => {
+                importSchema.mockImplementation(() => ({
+                    created_at: { type: 'DATETIME', defaultValue: 'CURRENT_TIMESTAMP' }
+                }));
+
+                const schema = getActiveRecordSchema('t', 'main', 'sqlite');
+
+                expect(schema.created_at.defaultValue).toBe('CURRENT_TIMESTAMP');
+            });
+        });
     });
 
 

package/test/activeRecord/helpers/queryInterface.js

@@ -9,6 +9,7 @@ const tableName2         = TestHelpers.Faker.Text.randomString();
 const mockQueryInterface = {
     showAllTables: jest.fn(() => [tableName1, tableName2]),
     describeTable: jest.fn(tableName => ({ name: tableName })),
+    showIndex: jest.fn(),
 };