@casekit/orm2-migrate 1.0.1 → 1.0.2

package/build/push/createExtensionSql.d.ts

@@ -1,2 +1,2 @@
 import { SQLStatement } from "@casekit/orm2";
-export declare const createExtensionsSql: (extension: string) => SQLStatement;
+export declare const createExtensionsSql: (schema: string, extension: string) => SQLStatement;

package/build/push/createExtensionSql.js

@@ -1,4 +1,4 @@
 import { sql } from "@casekit/orm2";
-export const createExtensionsSql = (extension) => {
-    return sql `CREATE EXTENSION IF NOT EXISTS ${sql.ident(extension)};`;
+export const createExtensionsSql = (schema, extension) => {
+    return sql `CREATE EXTENSION IF NOT EXISTS ${sql.ident(extension)} SCHEMA ${sql.ident(schema)};`;
 };

package/build/push/createExtensionSql.test.js

@@ -10,8 +10,8 @@ describe("createExtensionsSql", () => {
         await db.close();
     });
     test("creates SQL statement for creating an extension", async () => {
-        const statement = createExtensionsSql("uuid-ossp");
-        expect(statement.text).toEqual('CREATE EXTENSION IF NOT EXISTS "uuid-ossp";');
+        const statement = createExtensionsSql("foo", "uuid-ossp");
+        expect(statement.text).toEqual('CREATE EXTENSION IF NOT EXISTS "uuid-ossp" SCHEMA "foo";');
         expect(statement.values).toEqual([]);
         await db.transact(async (db) => {
             await expect(db.query(statement)).resolves.not.toThrow();

package/build/push/createTableSql.js

@@ -4,7 +4,7 @@ export const createTableSql = (model) => {
     const fields = Object.values(model.fields);
     const primaryKey = model.primaryKey;
     const statement = sql `CREATE TABLE IF NOT EXISTS ${sql.ident(model.schema)}.${sql.ident(model.table)} (\n`;
-    for (const field of fields) {
+    fields.forEach((field, i) => {
         statement.append `  ${sql.ident(field.column)} `;
         // dangerously appending raw SQL here, but we need to,
         // and this only comes from user-defined schemas, so should be ok
@@ -27,10 +27,11 @@ export const createTableSql = (model) => {
                 statement.push(sql.literal(JSON.stringify(field.default)));
             }
         }
-        statement.append `,\n`;
-    }
+        if (i < fields.length - 1)
+            statement.append `,\n`;
+    });
     if (primaryKey.length > 0) {
-        statement.append `  PRIMARY KEY (${sql.join(primaryKey.map((pk) => sql.ident(pk.column)), ", ")})`;
+        statement.append `,\n  PRIMARY KEY (${sql.join(primaryKey.map((pk) => sql.ident(pk.column)), ", ")})`;
     }
     statement.append `\n);`;
     return statement;

package/build/push.js

@@ -10,7 +10,9 @@ export const push = async (db) => {
     await db.transact(async (db) => {
         for (const extension of db.config.extensions) {
             console.log(` - Creating extension "${extension}"`);
-            await db.query(createExtensionsSql(extension));
+            for (const schema of schemas) {
+                await db.query(createExtensionsSql(schema, extension));
+            }
         }
         for (const schema of schemas.values()) {
             console.log(` - Creating schema "${schema}"`);

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@casekit/orm2-migrate",
   "description": "",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "",
   "dependencies": {
     "camelcase": "^8.0.0",
     "es-toolkit": "^1.39.3",
-    "@casekit/orm2": "1.0.1",
-    "@casekit/orm2-config": "1.0.1",
-    "@casekit/sql": "1.0.1",
-    "@casekit/orm2-schema": "1.0.1",
-    "@casekit/toolbox": "1.0.1"
+    "@casekit/orm2": "1.0.2",
+    "@casekit/orm2-config": "1.0.2",
+    "@casekit/sql": "1.0.2",
+    "@casekit/orm2-schema": "1.0.2",
+    "@casekit/toolbox": "1.0.2"
   },
   "devDependencies": {
     "@casekit/unindent": "^1.0.5",
@@ -26,9 +26,9 @@
     "uuid": "^11.1.0",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4",
-    "@casekit/orm2-fixtures": "1.0.1",
-    "@casekit/prettier-config": "1.0.1",
-    "@casekit/tsconfig": "1.0.1"
+    "@casekit/tsconfig": "1.0.2",
+    "@casekit/prettier-config": "1.0.2",
+    "@casekit/orm2-fixtures": "1.0.2"
   },
   "exports": {
     ".": "./build/index.js"