@yunsoft/yuncms 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yunsoft/yuncms",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Command-line setup and runtime launcher for YunCMS.",
   "license": "MIT",
   "type": "module",
@@ -30,7 +30,7 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@yunsoft/yuncms-api": "0.1.5",
-    "@yunsoft/yuncms-core": "0.1.5"
+    "@yunsoft/yuncms-api": "0.1.7",
+    "@yunsoft/yuncms-core": "0.1.7"
   }
 }

package/src/database-reset.js

@@ -15,18 +15,18 @@ export async function resetDatabaseObjects({
   const connection = await pool.getConnection();
   try {
     const [rows] = await connection.query(
-      `SELECT table_name, table_type
+      `SELECT TABLE_NAME AS object_name, TABLE_TYPE AS object_type
        FROM information_schema.tables
-       WHERE table_schema = ?
-       ORDER BY CASE WHEN table_type = 'VIEW' THEN 0 ELSE 1 END, table_name ASC`,
+       WHERE TABLE_SCHEMA = ?
+       ORDER BY CASE WHEN TABLE_TYPE = 'VIEW' THEN 0 ELSE 1 END, TABLE_NAME ASC`,
       [config.database],
     );
 
     await connection.query('SET FOREIGN_KEY_CHECKS = 0');
     try {
       for (const row of rows) {
-        const name = quoteIdentifier(row.table_name, 'database object name');
-        if (row.table_type === 'VIEW') {
+        const name = quoteIdentifier(row.object_name, 'database object name');
+        if (row.object_type === 'VIEW') {
           await connection.query(`DROP VIEW IF EXISTS ${name}`);
         } else {
           await connection.query(`DROP TABLE IF EXISTS ${name}`);

package/src/restore-command.js

@@ -60,7 +60,7 @@ export async function runRestoreCommand({
       await maintenanceLock.assertHeld();
     };
 
-    return await restoreBackup({
+    const restored = await restoreBackup({
       backupPath: resolve(cwd, positionals[0]),
       cwd,
       env,
@@ -68,6 +68,12 @@ export async function runRestoreCommand({
       allowDifferentDatabaseTarget: values['--allow-different-database-target'] === true,
       beforeDestructive,
     });
+    if (restored?.manifest?.project?.packageLock) {
+      output.warn?.('Project package files were restored. Run npm ci before starting YunCMS so node_modules matches the restored lockfile.');
+    } else if (restored?.manifest?.project?.packageJson) {
+      output.warn?.('Project package.json was restored. Run npm install before starting YunCMS so node_modules matches the restored project.');
+    }
+    return restored;
   } finally {
     if (maintenanceLock) await maintenanceLock.release();
     await lock.release();