masterrecord 0.2.10 → 0.2.12

package/Migrations/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-// version 0.0.6
+// version 0.0.7
 // https://docs.microsoft.com/en-us/ef/ef6/modeling/code-first/migrations/
 // how to add environment variables on cli call example - master=development masterrecord add-migration auth authContext
 
@@ -569,6 +569,85 @@ program.option('-V', 'output the version');
   });
 
 
+  program
+  .command('update-database-all')
+  .alias('uda')
+  .description('Scan the project for *Context.js files and run update-database on each')
+  .action(function(){
+    var executedLocation = process.cwd();
+    try{
+      // Find all context snapshots and run update per snapshot (avoids unrelated framework contexts)
+      var snapshotFiles = globSearch.sync(`${executedLocation}/**/*_contextSnapShot.json`, executedLocation);
+      if(!(snapshotFiles && snapshotFiles.length)){
+        console.log('No context snapshots found. Run enable-migrations for each context first.');
+        return;
+      }
+      // Group snapshots by context name (case-insensitive) and pick best per group
+      var groups = {};
+      for(const snapFile of snapshotFiles){
+        let cs;
+        try{ cs = require(snapFile); }catch(_){ continue; }
+        const nameFromPath = path.basename(snapFile).replace(/_contextSnapShot\.json$/i, '').toLowerCase();
+        const ctxName = (cs && cs.contextLocation)
+          ? path.basename(cs.contextLocation).replace(/\.js$/i, '').toLowerCase()
+          : nameFromPath;
+        const searchMigration = `${cs.migrationFolder}/**/*_migration.js`;
+        const migs = globSearch.sync(searchMigration, cs.migrationFolder) || [];
+        if(!groups[ctxName]) groups[ctxName] = [];
+        groups[ctxName].push({ snapFile, cs, ctxName, migs });
+      }
+
+      var migration = new Migration();
+      var ctxNames = Object.keys(groups);
+      for(const name of ctxNames){
+        try{
+          var list = groups[name];
+          // Prefer entries that actually have migration files
+          var withMigs = list.filter(e => e.migs && e.migs.length > 0);
+          var entry = withMigs.length ? withMigs[withMigs.length - 1] : list[0];
+          if(!(entry.migs && entry.migs.length)){
+            console.log(`Skipping ${entry.ctxName}: no migration files found.`);
+            continue;
+          }
+          var mFiles = entry.migs.slice().sort(function(a, b){
+            return __getMigrationTimestamp(a) - __getMigrationTimestamp(b);
+          });
+          var mFile = mFiles[mFiles.length - 1];
+
+          var ContextCtor;
+          try{ ContextCtor = require(entry.cs.contextLocation); }catch(_){
+            console.log(`Skipping ${entry.ctxName}: cannot load Context at '${entry.cs.contextLocation}'.`);
+            continue;
+          }
+          var contextInstance;
+          try{ contextInstance = new ContextCtor(); }catch(_){
+            console.log(`Skipping ${entry.ctxName}: failed to construct Context.`);
+            continue;
+          }
+          var migrationProjectFile = require(mFile);
+          var newMigrationProjectInstance = new migrationProjectFile(ContextCtor);
+          var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+          var tableObj = migration.buildUpObject(entry.cs.schema, cleanEntities);
+          newMigrationProjectInstance.up(tableObj);
+          var snap = {
+            file : entry.cs.contextLocation,
+            executedLocation : executedLocation,
+            context : contextInstance,
+            contextEntities : cleanEntities,
+            contextFileName: entry.ctxName
+          }
+          migration.createSnapShot(snap);
+          console.log(`database updated for ${entry.ctxName}`);
+        }catch(errCtx){
+          console.log('Error updating context: ', errCtx);
+        }
+      }
+    }catch(e){
+      console.log('Error - Cannot read or find file ', e);
+    }
+  });
+
+
 program.parse(process.argv);
 
 // Handle manual '-V' alias

package/Migrations/migrationMySQLQuery.js

@@ -15,7 +15,7 @@ class migrationMySQLQuery {
                 }
                 // Map belongsTo to its foreignKey name
                 var name = (col.relationshipType === 'belongsTo' && col.foreignKey) ? col.foreignKey : col.name;
-                columnList.push(name);
+                columnList.push(`\`${name}\``);
             }
         }
         return columnList.join(',');
@@ -63,7 +63,7 @@ class migrationMySQLQuery {
             }
         }
 
-        return `${tableName} ${type}${nullName}${defaultValue}${unique}${primaryKey}${auto}`;
+        return `\`${tableName}\` ${type}${nullName}${defaultValue}${unique}${primaryKey}${auto}`;
     }
 
     boolType(type){
@@ -135,7 +135,7 @@ class migrationMySQLQuery {
       
         if(table){
 
-            return `ALTER TABLE ${table.tableName} MODIFY COLUMN ${this.#columnMapping(table.table)} `;
+            return `ALTER TABLE \`${table.tableName}\` MODIFY COLUMN ${this.#columnMapping(table.table)} `;
         }
         else{
             console.log("table information is null");
@@ -152,8 +152,8 @@ class migrationMySQLQuery {
 
 
     addColum(table){
-        return `ALTER TABLE ${table.tableName}
-        ADD ${table.name} ${table.realDataType}`;
+        return `ALTER TABLE \`${table.tableName}\`
+        ADD \`${table.name}\` ${table.realDataType}`;
 
         /*
             column definations
@@ -172,7 +172,7 @@ class migrationMySQLQuery {
         is indexed
         appears in a view
         */
-        return `ALTER TABLE ${table.tableName} DROP COLUMN ${table.name}`;
+        return `ALTER TABLE \`${table.tableName}\` DROP COLUMN \`${table.name}\``;
     }
 
     insertInto(name, table){
@@ -193,7 +193,7 @@ class migrationMySQLQuery {
             }
         }
 
-        var completeQuery = `CREATE TABLE IF NOT EXISTS ${table.__name} (${queryVar.replace(/,\s*$/, "")});`;
+        var completeQuery = `CREATE TABLE IF NOT EXISTS \`${table.__name}\` (${queryVar.replace(/,\s*$/, "")});`;
         return completeQuery;
 
             /*
@@ -213,15 +213,15 @@ class migrationMySQLQuery {
 
 
     dropTable(name){
-        return `DROP TABLE ${name}`
+        return `DROP TABLE \`${name}\``
     }
 
     renameTable(table){
-        return `ALTER TABLE ${table.tableName} RENAME TO ${table.newName}`;
+        return `ALTER TABLE \`${table.tableName}\` RENAME TO \`${table.newName}\``;
     }
 
     renameColumn(table){
-        return `ALTER TABLE ${table.tableName} RENAME COLUMN ${table.name} TO ${table.newName}`
+        return `ALTER TABLE \`${table.tableName}\` RENAME COLUMN \`${table.name}\` TO \`${table.newName}\``
     }
 
     

package/Migrations/schema.js

@@ -356,7 +356,15 @@ class schema{
                 const esc = String(v).replace(/'/g, "''");
                 return `'${esc}'`;
             }).join(", ");
-            const sql = `INSERT INTO ${tableName} (${colList}) VALUES (${vals})`;
+            // Idempotent seed: ignore duplicates on unique indexes
+            let sql;
+            if(this.context.isSQLite){
+                sql = `INSERT OR IGNORE INTO ${tableName} (${colList}) VALUES (${vals})`;
+            } else if(this.context.isMySQL){
+                sql = `INSERT IGNORE INTO ${tableName} (${colList}) VALUES (${vals})`;
+            } else {
+                sql = `INSERT INTO ${tableName} (${colList}) VALUES (${vals})`;
+            }
             this.context._execute(sql);
         }
     }

package/mySQLSyncConnect.js

@@ -1,4 +1,4 @@
-// version : 0.0.3
+// version : 0.0.4
 
 var MySql = require('sync-mysql2');
 
@@ -60,8 +60,20 @@ class MySQLClient {
     }
 
     close() {
-        if (this.connection) {
-            this.connection.end();
+        try {
+            if (!this.connection) { return; }
+            if (typeof this.connection.finishAll === 'function') {
+                // Drain any pending RPC calls
+                try { this.connection.finishAll(); } catch(_) { /* ignore */ }
+            }
+            if (typeof this.connection.end === 'function') {
+                try { this.connection.end(); } catch(_) { /* ignore */ }
+            } else if (typeof this.connection.close === 'function') {
+                try { this.connection.close(); } catch(_) { /* ignore */ }
+            } else if (typeof this.connection.dispose === 'function') {
+                try { this.connection.dispose(); } catch(_) { /* ignore */ }
+            }
+        } finally {
             this.connection = null;
         }
     }

package/package.json

@@ -9,7 +9,7 @@
     "app-root-path": "^3.1.0",
     "better-sqlite3": "^12.4.1"
   },
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "An Object-relational mapping for the Master framework. Master Record connects classes to relational database tables to establish a database with almost zero-configuration ",
   "homepage": "https://github.com/Tailor/MasterRecord#readme",
   "repository": {