whitelabel-db 1.1.93 → 1.1.94

package/dist/libs/database.d.ts

@@ -5,4 +5,4 @@ export interface ConnectionDetails {
     password: string;
     dbname: string;
 }
-export declare const connect: (connectionDetails: ConnectionDetails) => Promise<void | Sequelize>;
+export declare const connect: (connectionDetails: ConnectionDetails) => Promise<Sequelize>;

package/dist/libs/database.js

@@ -72,14 +72,17 @@ const connect = (connectionDetails) => __awaiter(void 0, void 0, void 0, functio
             CollectionItemCustomField_1.CollectionItemCustomField,
         ],
     });
-    return connection
-        .authenticate()
-        .then(() => {
+    try {
+        yield connection.authenticate();
         console.log('Database connection has been established successfully.');
-        return connection.sync();
-    })
-        .catch((err) => {
+        // Ensure sync completes and creates necessary tables including SequelizeMeta
+        yield connection.sync({ alter: false });
+        console.log('Database sync completed successfully.');
+        return connection;
+    }
+    catch (err) {
         console.error('Unable to connect to the database:', err);
-    });
+        throw err;
+    }
 });
 exports.connect = connect;

package/dist/libs/migration.js

@@ -44,14 +44,37 @@ const runMigrations = (sequelize) => __awaiter(void 0, void 0, void 0, function*
         console.error(`Migrations directory not found at: ${migrationsPath}`);
         return;
     }
+    // Ensure SequelizeMeta table exists - this handles cases where sync() didn't create it
+    try {
+        yield sequelize.query(`
+      CREATE TABLE IF NOT EXISTS "SequelizeMeta" (
+        "name" VARCHAR(255) NOT NULL,
+        PRIMARY KEY ("name")
+      );
+    `);
+        console.log('SequelizeMeta table ensured to exist');
+    }
+    catch (error) {
+        console.error('Error creating SequelizeMeta table:', error);
+        throw error;
+    }
     // Read and sort migration files
     const migrationFiles = fs_1.default
         .readdirSync(migrationsPath)
         .filter((file) => file.match(/^\d{3}-.+\.ts$/) || file.match(/^\d{3}-.+\.js$/)) // Matches .ts and .js files
         .filter((file) => !file.endsWith('.d.ts')) // Exclude .d.ts files
         .sort(); // Sort files by name
-    const [results] = yield sequelize.query('SELECT name FROM "SequelizeMeta"');
-    const executedMigrations = results.map((row) => row.name);
+    // Get executed migrations - now this should always work since we ensured the table exists
+    let executedMigrations = [];
+    try {
+        const [results] = yield sequelize.query('SELECT name FROM "SequelizeMeta"');
+        executedMigrations = results.map((row) => row.name);
+        console.log(`Found ${executedMigrations.length} previously executed migrations`);
+    }
+    catch (error) {
+        console.error('Unexpected error fetching executed migrations:', error);
+        throw error;
+    }
     for (const file of migrationFiles) {
         if (!executedMigrations.includes(file)) {
             const migration = yield Promise.resolve(`${path_1.default.join(migrationsPath, file)}`).then(s => __importStar(require(s)));
@@ -59,10 +82,11 @@ const runMigrations = (sequelize) => __awaiter(void 0, void 0, void 0, function*
                 console.log(`Running migration: ${file}`);
                 yield migration.up(sequelize.getQueryInterface());
                 yield sequelize.query(`INSERT INTO "SequelizeMeta" (name) VALUES ('${file}')`);
+                console.log(`Completed migration: ${file}`);
             }
         }
         else {
-            console.log(`Skipping migration: ${file}`);
+            console.log(`Skipping migration: ${file} (already executed)`);
         }
     }
     console.log('Migrations completed.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whitelabel-db",
-  "version": "1.1.93",
+  "version": "1.1.94",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",