mythix-orm-sql-base 1.0.2 → 1.0.5

package/lib/sql-connection-base.js

@@ -46,7 +46,7 @@ class SQLConnectionBase extends ConnectionBase {
       if (item === null)
         return true;
 
-      if (item instanceof Literals.LiteralBase)
+      if (Literals.LiteralBase.isLiteral(item))
         return true;
 
       if (!Nife.instanceOf(item, 'string', 'number', 'bigint', 'boolean'))
@@ -303,12 +303,12 @@ class SQLConnectionBase extends ConnectionBase {
       let model   = models[i];
       let promise = model[operationHookName](context);
 
-      if (!(promise instanceof Promise))
-        promise = Promise.resolve();
+      if (!Nife.instanceOf(promise, 'promise'))
+        promise = Promise.resolve(promise);
 
       promise = promise.then(async () => await model[saveHookName](context), throwError);
-      if (!(promise instanceof Promise))
-        promise = Promise.resolve();
+      if (!Nife.instanceOf(promise, 'promise'))
+        promise = Promise.resolve(promise);
 
       promises.push(promise);
     }
@@ -324,6 +324,42 @@ class SQLConnectionBase extends ConnectionBase {
     return await this.query(createTableSQL, options);
   }
 
+  async dropTables(_Models, options) {
+    if (!_Models)
+      return;
+
+    // First we collect all models and put them into a map
+    let modelMap = _Models;
+
+    if (Nife.instanceOf(_Models, 'array', 'function')) {
+      modelMap = {};
+
+      let Models = Nife.toArray(_Models).filter(Boolean);
+      for (let i = 0, il = Models.length; i < il; i++) {
+        let Model     = Models[i];
+        let modelName = Model.getModelName();
+
+        modelMap[modelName] = Model;
+      }
+    }
+
+    // Second we sort the model names in creation order,
+    // and going in reverse of that order we destroy
+    // each table.
+    let modelNames        = Object.keys(modelMap);
+    let sortedModelNames  = Utils.sortModelNamesByCreationOrder(this, modelNames);
+    let results           = [];
+
+    for (let i = sortedModelNames.length - 1; i >= 0; i--) {
+      let modelName = sortedModelNames[i];
+      let Model     = modelMap[modelName];
+
+      results.push(await this.dropTable(Model, options));
+    }
+
+    return results;
+  }
+
   async createTable(Model, options) {
     let queryGenerator  = this.getQueryGenerator();
     let createTableSQL  = queryGenerator.generateCreateTableStatement(Model, options);
@@ -343,6 +379,41 @@ class SQLConnectionBase extends ConnectionBase {
     return result;
   }
 
+  async createTables(_Models, options) {
+    if (!_Models)
+      return;
+
+    // First we collect all models and put them into a map
+    let modelMap = _Models;
+
+    if (Nife.instanceOf(_Models, 'array', 'function')) {
+      modelMap = {};
+
+      let Models = Nife.toArray(_Models).filter(Boolean);
+      for (let i = 0, il = Models.length; i < il; i++) {
+        let Model     = Models[i];
+        let modelName = Model.getModelName();
+
+        modelMap[modelName] = Model;
+      }
+    }
+
+    // Second we sort the model names in creation order,
+    // and then create the tables in that order
+    let modelNames        = Object.keys(modelMap);
+    let sortedModelNames  = Utils.sortModelNamesByCreationOrder(this, modelNames);
+    let results           = [];
+
+    for (let i = 0, il = sortedModelNames.length; i < il; i++) {
+      let modelName = sortedModelNames[i];
+      let Model     = modelMap[modelName];
+
+      results.push(await this.createTable(Model, options));
+    }
+
+    return results;
+  }
+
   async insert(Model, models, _options) {
     return await this.bulkModelOperation(
       Model,
@@ -573,7 +644,8 @@ class SQLConnectionBase extends ConnectionBase {
 
   async aggregate(_queryEngine, _literal, options) {
     let literal = _literal;
-    if (!(literal instanceof Literals.LiteralBase))
+
+    if (!Literals.LiteralBase.isLiteral(literal))
       throw new Error(`${this.constructor.name}::aggregate: Second argument must be a Literal instance.`);
 
     let queryEngine = this.toQueryEngine(_queryEngine);
@@ -671,9 +743,9 @@ class SQLConnectionBase extends ConnectionBase {
     if (_options && !Nife.instanceOf(_options, 'object'))
       throw new TypeError(`${this.constructor.name}::pluck: "options" isn't an object. Did you pass a field by accident?`);
 
-    let options               = _options || {};
-    let providedArrayOfFields = Array.isArray(_fields);
-    let fields                = Nife.arrayFlatten(Nife.toArray(_fields)).filter(Boolean);
+    let options                   = _options || {};
+    let moreThanOneFieldRequested = (Array.isArray(_fields) && _fields.length > 1);
+    let fields                    = Nife.arrayFlatten(Nife.toArray(_fields)).filter(Boolean);
 
     if (Nife.isEmpty(fields))
       throw new Error(`${this.constructor.name}::pluck: You must supply "fields" to pluck.`);
@@ -744,7 +816,7 @@ class SQLConnectionBase extends ConnectionBase {
       });
     }
 
-    if (!providedArrayOfFields)
+    if (!moreThanOneFieldRequested)
       finalResults = finalResults.map((row) => row[0]);
 
     return finalResults;

package/lib/sql-query-generator-base.js

@@ -118,7 +118,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
   // eslint-disable-next-line no-unused-vars
   generateSelectQueryOperatorFromQueryEngineOperator(operator, value, valueIsReference, options) {
-    if (operator instanceof LiteralBase)
+    if (LiteralBase.isLiteral(operator))
       return operator.toString(this.connection);
 
     switch (operator) {
@@ -422,7 +422,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
   // eslint-disable-next-line no-unused-vars
   generateOrderClause(_orders, _options) {
-    if (_orders instanceof LiteralBase)
+    if (LiteralBase.isLiteral(_orders))
       return _orders.toString(this.connection);
 
     let orders  = Nife.toArray(_orders).filter(Boolean);
@@ -434,7 +434,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     for (let i = 0, il = orders.length; i < il; i++) {
       let orderField = orders[i];
 
-      if (orderField instanceof LiteralBase) {
+      if (LiteralBase.isLiteral(orderField)) {
         orderByParts.push(orderField.toString(this.connection));
         continue;
       }
@@ -469,7 +469,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
   // eslint-disable-next-line no-unused-vars
   generateLimitClause(limit, options) {
-    if (limit instanceof LiteralBase)
+    if (LiteralBase.isLiteral(limit))
       return limit.toString(this.connection);
 
     return `LIMIT ${limit}`;
@@ -477,7 +477,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
   // eslint-disable-next-line no-unused-vars
   generateOffsetClause(offset, options) {
-    if (offset instanceof LiteralBase)
+    if (LiteralBase.isLiteral(offset))
       return offset.toString(this.connection);
 
     return `OFFSET ${offset}`;
@@ -586,7 +586,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       }
     }
 
-    if (defaultValue instanceof LiteralBase) {
+    if (LiteralBase.isLiteral(defaultValue)) {
       if (defaultValue.options.escape === false)
         escapeValue = false;
 
@@ -767,7 +767,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       let defaultValue = this.getFieldDefaultValue(field, fieldName, { remoteOnly: true });
 
       if (field.primaryKey) {
-        if (field.primaryKey instanceof LiteralBase)
+        if (LiteralBase.isLiteral(field.primaryKey))
           constraintParts.push(field.primaryKey.toString(this.connection));
         else
           constraintParts.push('PRIMARY KEY');
@@ -776,7 +776,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
           constraintParts.push('NOT NULL');
       } else {
         if (field.unique) {
-          if (field.unique instanceof LiteralBase)
+          if (LiteralBase.isLiteral(field.unique))
             constraintParts.push(field.unique.toString(this.connection));
           else
             constraintParts.push('UNIQUE');
@@ -838,7 +838,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
         modelChanges[fieldName] = fieldValue;
 
-        if (fieldValue instanceof LiteralBase)
+        if (LiteralBase.isLiteral(fieldValue))
           fieldValue = fieldValue.toString(this.connection);
         else
           fieldValue = this.escape(field, fieldValue);
@@ -866,7 +866,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
 
     for (let i = 0, il = models.length; i < il; i++) {
       let model = models[i];
-      if (!(model instanceof ModelBase))
+      if (!ModelBase.isModel(model))
         model = new Model(model);
 
       let { rowValues, modelChanges } = this.generateInsertFieldValuesFromModel(model, subOptions);
@@ -940,7 +940,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
     }
 
     let model = _model;
-    if (!(model instanceof ModelBase)) {
+    if (!ModelBase.isModel(model)) {
       let newModel = new Model();
       newModel.clearDirty();
       newModel.setAttributes(model);
@@ -967,7 +967,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
       let dirtyField        = dirtyFields[i];
       let fieldValue        = modelChanges[dirtyField.fieldName].current;
       let escapedColumnName = this.escapeID(dirtyField.columnName);
-      let escapedValue      = (fieldValue instanceof LiteralBase) ? fieldValue.toString(this.connection) : this.escape(dirtyField, fieldValue);
+      let escapedValue      = (LiteralBase.isLiteral(fieldValue)) ? fieldValue.toString(this.connection) : this.escape(dirtyField, fieldValue);
       if (!escapedValue)
         continue;
 
@@ -1082,7 +1082,7 @@ class SQLQueryGeneratorBase extends QueryGeneratorBase {
           continue;
 
         let fieldValue = dirtyStatus.current;
-        if (!(fieldValue instanceof Literals.LiteralBase))
+        if (!LiteralBase.isLiteral(fieldValue))
           continue;
 
         if (!fieldValue.options.remote)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,10 +33,10 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.0.0"
+    "mythix-orm": "^1.1.0"
   },
   "dependencies": {
-    "nife": "^1.11.2",
+    "nife": "^1.11.3",
     "uuid": "^8.3.2"
   },
   "devDependencies": {