masterrecord 0.2.10 → 0.2.11

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,96 @@ 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 files (e.g., chatContext.js)
+      var allFiles = globSearch.sync(`${executedLocation}/**/*Context.js`, executedLocation);
+      if(!(allFiles && allFiles.length)){
+        console.log('No Context files found.');
+        return;
+      }
+      // Deduplicate by basename (case-insensitive)
+      var seen = new Set();
+      var contextFiles = [];
+      for(const f of allFiles){
+        var name = path.basename(f).toLowerCase();
+        if(!seen.has(name)){
+          seen.add(name);
+          contextFiles.push(f);
+        }
+      }
+      var migration = new Migration();
+      // Process each context independently
+      for(const ctxFile of contextFiles){
+        try{
+          var base = path.basename(ctxFile);
+          var ctxName = base.replace(/\.js$/i, '').toLowerCase();
+          // Locate snapshot for this context
+          var snapMatches = globSearch.sync(`${executedLocation}/**/*${ctxName}_contextSnapShot.json`, executedLocation);
+          var snapFile = snapMatches && snapMatches[0];
+          if(!snapFile){
+            console.log(`Skipping ${ctxName}: snapshot not found. Run 'masterrecord enable-migrations ${ctxName}'.`);
+            continue;
+          }
+          var contextSnapshot;
+          try{ contextSnapshot = require(snapFile); }catch(_){
+            console.log(`Skipping ${ctxName}: cannot read context snapshot at '${snapFile}'.`);
+            continue;
+          }
+          // Get migration files for this snapshot folder
+          var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
+          var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
+          if(!(migrationFiles && migrationFiles.length)){
+            console.log(`Skipping ${ctxName}: no migration files found.`);
+            continue;
+          }
+          // Pick latest
+          var mFiles = migrationFiles.slice().sort(function(a, b){
+            return __getMigrationTimestamp(a) - __getMigrationTimestamp(b);
+          });
+          var mFile = mFiles[mFiles.length - 1];
+
+          var ContextCtor;
+          try{ ContextCtor = require(contextSnapshot.contextLocation); }catch(_){
+            console.log(`Skipping ${ctxName}: cannot load Context at '${contextSnapshot.contextLocation}'.`);
+            continue;
+          }
+          var contextInstance;
+          try{ contextInstance = new ContextCtor(); }catch(_){
+            console.log(`Skipping ${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(contextSnapshot.schema, cleanEntities);
+          // Run up for this context
+          newMigrationProjectInstance.up(tableObj);
+          // Update snapshot
+          var snap = {
+            file : contextSnapshot.contextLocation,
+            executedLocation : executedLocation,
+            context : contextInstance,
+            contextEntities : cleanEntities,
+            contextFileName: ctxName
+          }
+          migration.createSnapShot(snap);
+          console.log(`database updated for ${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/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.11",
   "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": {