masterrecord 0.2.11 → 0.2.12

package/Migrations/cli.js

@@ -576,79 +576,68 @@ program.option('-V', 'output the version');
   .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.');
+      // 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;
       }
-      // 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);
-        }
+      // 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();
-      // Process each context independently
-      for(const ctxFile of contextFiles){
+      var ctxNames = Object.keys(groups);
+      for(const name of ctxNames){
         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.`);
+          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;
           }
-          // Pick latest
-          var mFiles = migrationFiles.slice().sort(function(a, b){
+          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(contextSnapshot.contextLocation); }catch(_){
-            console.log(`Skipping ${ctxName}: cannot load Context at '${contextSnapshot.contextLocation}'.`);
+          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 ${ctxName}: failed to construct Context.`);
+            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(contextSnapshot.schema, cleanEntities);
-          // Run up for this context
+          var tableObj = migration.buildUpObject(entry.cs.schema, cleanEntities);
           newMigrationProjectInstance.up(tableObj);
-          // Update snapshot
           var snap = {
-            file : contextSnapshot.contextLocation,
+            file : entry.cs.contextLocation,
             executedLocation : executedLocation,
             context : contextInstance,
             contextEntities : cleanEntities,
-            contextFileName: ctxName
+            contextFileName: entry.ctxName
           }
           migration.createSnapShot(snap);
-          console.log(`database updated for ${ctxName}`);
+          console.log(`database updated for ${entry.ctxName}`);
         }catch(errCtx){
           console.log('Error updating context: ', errCtx);
         }

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/package.json

@@ -9,7 +9,7 @@
     "app-root-path": "^3.1.0",
     "better-sqlite3": "^12.4.1"
   },
-  "version": "0.2.11",
+  "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": {