@inflector/optima-pg 1.0.3 → 1.0.5

package/dist/index.d.ts

@@ -345,7 +345,7 @@ declare const vector: (dimension: number) => FluentStep<{
 }>;
 type AnyColumn = FluentStep<any, any, any>;
 declare const table: <T extends Record<string, AnyColumn>>(cols: T) => T;
-declare function getDefSQL(tableName: string, cols: Record<string, AnyColumn>): string;
+declare function getDefSQL(tableName: string, cols: Record<string, AnyColumn>, schema?: string): string;
 
 type WhereArg<Cols extends Record<string, unknown>> = WhereInput<Cols> | [keyof Cols & string, string, unknown];
 declare class Table<T extends Record<string, AnyColumn>> {
@@ -1647,6 +1647,6 @@ interface MigrationStatement {
  *   { users: usersTable, posts: postsTable },
  * );
  */
-declare function generateMigration(prev: SchemaMap, next: SchemaMap): string;
+declare function generateMigration(prev: SchemaMap, next: SchemaMap, schema?: string): string;
 
 export { ARITHMETIC_OPERATORS, type AnyColumn, type AnyOperator, type ArithmeticOperator, BINARY_OPERATORS, type BinaryOperator, type BuiltCol, COMPARISON_OPERATORS, type ChangeEvent, Column, type ComparisonOperator, Database, type Expr, type InferSchema, JSON_OPERATORS, type JsonOperator, type ListenFn, type MigrationStatement, OPERATORS, type Prettify, type Restrict, type SchemaMap, type SetFlag, Table, UNARY_FILTER_OPERATORS, UNARY_OPERATORS, type UnaryOperator, type WhereCondition, type WhereInput, type WhereNode, add, array, bang, between, betweenSymmetric, bool, buildWhere, bytea, containedBy, contains, createFluentBuilder, distance, eq, eqq, float, generateMigration, getDefSQL, gt, gte, hasAllKeys, hasAnyKey, hasKey, ilike, inList, int, iregex, is, isDistinct, isNot, isNotDistinct, json, like, lt, lte, match, neq, neqAlt, notGt, notIlike, notIn, notIregex, notLike, notLt, notRegex, nullSafeEq, op, overlaps, regex, regexp, startsWith, table, text, time, timestamp, tsMatch, tsPhrase, unary, uuid, vector };

package/dist/index.js

@@ -285,7 +285,7 @@ var vector = (dimension) => {
 var table = (cols) => {
   return cols;
 };
-function getDefSQL(tableName, cols) {
+function getDefSQL(tableName, cols, schema) {
   const formatDefault2 = (def) => {
     if (typeof def === "string") return `'${def.replace(/'/g, "''")}'`;
     if (typeof def === "boolean") return def ? "true" : "false";
@@ -315,7 +315,7 @@ function getDefSQL(tableName, cols) {
     }
     return "  " + parts.join(" ");
   });
-  return `CREATE TABLE IF NOT EXISTS "${tableName}" (
+  return `CREATE TABLE IF NOT EXISTS ${schema ? schema + "." : ""}"${tableName}" (
 ${columns.join(",\n")}
 );`;
 }
@@ -602,10 +602,8 @@ var init = async (db, client, tables, isPGlite) => {
             FOR EACH ROW EXECUTE FUNCTION notify_table_change();
         `;
     if (isPGlite) {
-      await client.query(tableSQL);
       await client.query(triggerSQL);
     } else {
-      await sql2.raw(tableSQL).execute(db);
       await sql2.raw(triggerSQL).execute(db);
     }
   }
@@ -814,7 +812,7 @@ function diffTable(tableName, prevCols, nextCols) {
   }
   return stmts;
 }
-function generateMigration(prev, next) {
+function generateMigration(prev, next, schema) {
   const stmts = [];
   const prevTables = new Set(Object.keys(prev));
   const nextTables = new Set(Object.keys(next));
@@ -828,22 +826,10 @@ function generateMigration(prev, next) {
   }
   for (const table2 of nextTables) {
     if (!prevTables.has(table2)) {
-      const cols = next[table2];
-      const colDefs = Object.entries(cols).map(([colName, col]) => {
-        const def = build(col);
-        const parts = [`"${colName}"`, def.SQlType ?? "text"];
-        if (def.primaryKey) parts.push("PRIMARY KEY");
-        if (def.notnull) parts.push("NOT NULL");
-        if (def.unique) parts.push("UNIQUE");
-        const defaultExpr = resolveDefault(def);
-        if (defaultExpr !== void 0) parts.push(`DEFAULT ${defaultExpr}`);
-        return "  " + parts.join(" ");
-      }).join(",\n");
+      const sql3 = getDefSQL(table2, next[table2], schema);
       stmts.push({
         kind: "create_table",
-        sql: `CREATE TABLE IF NOT EXISTS "${table2}" (
-${colDefs}
-);`
+        sql: sql3
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inflector/optima-pg",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "author": "Inflector",
   "main": "./dist/index.js",