mythix-orm-postgresql 1.5.1 → 1.6.0

package/lib/postgresql-connection.js

@@ -4,7 +4,7 @@
 'use strict';
 
 const Nife                      = require('nife');
-const moment                    = require('moment');
+const { DateTime }              = require('luxon');
 const PG                        = require('pg');
 const PGFormat                  = require('pg-format');
 const { Literals }              = require('mythix-orm');
@@ -99,15 +99,15 @@ class PostgreSQLConnection extends SQLConnectionBase {
         // This will get discarded by createTable...
         // but we need the value later to select the
         // proper column data type
-        return new Literals.Literal('@@@AUTOINCREMENT@@@', { noDefaultStatementOnCreateTable: true, remote: true });
+        return new Literals.Literal('AUTOINCREMENT', { noDefaultStatementOnCreateTable: true, remote: true });
       case 'DATETIME_NOW':
-        return new Literals.Literal('(NOW() AT TIME ZONE(\'UTC\'))', { escape: false, remote: true });
+        return new Literals.Literal('(FLOOR(EXTRACT(EPOCH FROM NOW()) * 1000))', { escape: false, remote: true });
       case 'DATE_NOW':
-        return new Literals.Literal('(NOW() AT TIME ZONE(\'UTC\'))', { escape: false, remote: true });
+        return new Literals.Literal('(FLOOR(EXTRACT(EPOCH FROM NOW()) * 1000))', { escape: false, remote: true });
       case 'DATETIME_NOW_LOCAL':
-        return moment().toDate();
+        return DateTime.now().toMillis();
       case 'DATE_NOW_LOCAL':
-        return moment().startOf('day').toDate();
+        return DateTime.now().startOf('day').toMillis();
       default:
         return type;
     }
@@ -279,7 +279,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
   _bigintTypeToString(type, _options) {
     let options = _options || {};
 
-    if (options.createTable && options.defaultValue === '@@@AUTOINCREMENT@@@')
+    if (options.createTable && options.defaultValue === 'AUTOINCREMENT')
       return this._intTypeToSerial(type);
 
     return 'BIGINT';
@@ -288,7 +288,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
   _integerTypeToString(type, _options) {
     let options = _options || {};
 
-    if (options.createTable && options.defaultValue === '@@@AUTOINCREMENT@@@')
+    if (options.createTable && options.defaultValue === 'AUTOINCREMENT')
       return this._intTypeToSerial(type);
 
     return 'INTEGER';
@@ -298,8 +298,14 @@ class PostgreSQLConnection extends SQLConnectionBase {
     return 'BYTEA';
   }
 
+  // eslint-disable-next-line no-unused-vars
+  _dateTypeToString(type) {
+    return 'BIGINT';
+  }
+
+  // eslint-disable-next-line no-unused-vars
   _datetimeTypeToString(type) {
-    return 'TIMESTAMP';
+    return 'BIGINT';
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -359,15 +365,6 @@ class PostgreSQLConnection extends SQLConnectionBase {
 
     return result;
   }
-
-  convertDateToDBTime(value) {
-    if (value instanceof Date || (value && value.constructor && value.constructor.name === 'Date'))
-      return moment(value).utc(true).toDate();
-    else if (moment.isMoment(value))
-      return value.utc(true).toDate();
-
-    return value;
-  }
 }
 
 module.exports = PostgreSQLConnection;

package/lib/postgresql-query-generator.js

@@ -84,59 +84,9 @@ class PostgreSQLQueryGenerator extends SQLQueryGeneratorBase {
     return this._collectReturningFields(Model, model, options, context);
   }
 
-  generateCreateTableStatement(Model, _options) {
+  generateColumnDeclarationStatement(Model, field, _options) {
     let options = _options || {};
-    let fieldParts = [];
-
-    Model.iterateFields(({ field, fieldName }) => {
-      if (field.type.isVirtual())
-        return;
-
-      let columnName      = field.columnName || fieldName;
-      let constraintParts = [];
-
-      let defaultValue = this.getFieldDefaultValue(field, fieldName, { remoteOnly: true });
-
-      if (field.primaryKey) {
-        if (field.primaryKey instanceof LiteralBase)
-          constraintParts.push(field.primaryKey.toString(this.connection));
-        else
-          constraintParts.push('PRIMARY KEY');
-
-        if (defaultValue !== '@@@AUTOINCREMENT@@@')
-          constraintParts.push('NOT NULL');
-      } else {
-        if (field.unique) {
-          if (field.unique instanceof LiteralBase)
-            constraintParts.push(field.unique.toString(this.connection));
-          else
-            constraintParts.push('UNIQUE');
-        }
-
-        if (field.allowNull === false)
-          constraintParts.push('NOT NULL');
-      }
-
-      if (defaultValue !== undefined && defaultValue !== '@@@AUTOINCREMENT@@@')
-        constraintParts.push(defaultValue);
-
-      constraintParts = constraintParts.join(' ');
-      if (Nife.isNotEmpty(constraintParts))
-        constraintParts = ` ${constraintParts}`;
-
-      fieldParts.push(`  ${this.escapeID(columnName)} ${field.type.toConnectionType(this.connection, { createTable: true, defaultValue })}${constraintParts}`);
-    });
-
-    let ifNotExists = 'IF NOT EXISTS ';
-    if (options.ifNotExists === false)
-      ifNotExists = '';
-
-    let trailingParts = Nife.toArray(this.generateCreateTableStatementInnerTail(Model, options)).filter(Boolean);
-    if (Nife.isNotEmpty(trailingParts))
-      fieldParts = fieldParts.concat(trailingParts.map((part) => `  ${part.trim()}`));
-
-    let finalStatement = `CREATE TABLE ${ifNotExists}${this.escapeID(Model.getTableName(this.connection))} (${fieldParts.join(',\n')}\n);`;
-    return finalStatement;
+    return super.generateColumnDeclarationStatement(Model, field, { ...options, noAutoIncrementDefault: true });
   }
 
   generateTruncateTableStatement(Model, _options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-postgresql",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "PostgreSQL driver for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,10 +33,11 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-postgresql#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.6.3",
-    "mythix-orm-sql-base": "^1.5.2"
+    "mythix-orm": "^1.7.0",
+    "mythix-orm-sql-base": "^1.6.0"
   },
   "dependencies": {
+    "luxon": "^3.0.4",
     "nife": "^1.12.1",
     "pg": "^8.8.0",
     "pg-format": "^1.0.4",
@@ -46,7 +47,6 @@
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
     "eslint": "^8.23.1",
     "jasmine": "^4.4.0",
-    "moment": "^2.29.4",
     "nyc": "^15.1.0"
   },
   "nyc": {