drizzle-kit 0.20.17-c057923 → 0.20.17-c8aaf94

package/@types/utils.d.ts

@@ -2,6 +2,7 @@ declare global {
     interface String {
         trimChar(char: string): string;
         squashSpaces(): string;
+        capitalise(): string;
         camelCase(): string;
         concatIf(it: string, condition: boolean): string;
     }

package/bin.cjs

@@ -1076,7 +1076,7 @@ var require_hanji = __commonJS({
 });
 
 // src/cli/views.ts
-var import_hanji, err, info, error, schema, isRenamePromptItem, ResolveColumnSelect, tableKey, ResolveSelect, ResolveSchemasSelect, Spinner, IntrospectProgress, DropMigrationView, trimmedRange;
+var import_hanji, err, info, grey, error, schema, isRenamePromptItem, ResolveColumnSelect, tableKey, ResolveSelect, ResolveSchemasSelect, Spinner, IntrospectProgress, DropMigrationView, trimmedRange;
 var init_views = __esm({
   "src/cli/views.ts"() {
     "use strict";
@@ -1089,6 +1089,9 @@ var init_views = __esm({
     info = (msg, greyMsg = "") => {
       return `${source_default.blue.bold("Info:")} ${msg} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
     };
+    grey = (msg) => {
+      return source_default.grey(msg);
+    };
     error = (error2, greyMsg = "") => {
       return `${source_default.red.bold("Err:")} ${error2} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
     };
@@ -1339,14 +1342,14 @@ Is ${source_default.bold.blue(
         this.requestLayout();
       }
       render() {
-        let info3 = "";
+        let info4 = "";
         const spin = this.spinner.value();
-        info3 += this.statusText(spin, this.state.tables);
-        info3 += this.statusText(spin, this.state.columns);
-        info3 += this.statusText(spin, this.state.enums);
-        info3 += this.statusText(spin, this.state.indexes);
-        info3 += this.statusText(spin, this.state.fks);
-        return info3;
+        info4 += this.statusText(spin, this.state.tables);
+        info4 += this.statusText(spin, this.state.columns);
+        info4 += this.statusText(spin, this.state.enums);
+        info4 += this.statusText(spin, this.state.indexes);
+        info4 += this.statusText(spin, this.state.fks);
+        return info4;
       }
     };
     DropMigrationView = class extends import_hanji.Prompt {
@@ -8320,6 +8323,9 @@ var init_utils3 = __esm({
     String.prototype.camelCase = function() {
       return camelCase(String(this));
     };
+    String.prototype.capitalise = function() {
+      return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+    };
     String.prototype.concatIf = function(it, condition) {
       return condition ? `${this}${it}` : String(this);
     };
@@ -8661,7 +8667,7 @@ var init_cli = __esm({
       dialect: dialect3,
       schema: unionType([stringType(), stringType().array()]).optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilters: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
       driver: stringType().optional(),
       // pg
       connectionString: stringType().optional(),
@@ -8700,7 +8706,7 @@ var init_cli = __esm({
       authToken: stringType().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true)
-    });
+    }).passthrough();
     configCheck = objectType({
       dialect: dialect3.optional(),
       out: stringType().optional()
@@ -11743,13 +11749,13 @@ var require_node2 = __commonJS({
       }
       function asyncGeneratorStep(gen, resolve2, reject, _next, _throw, key, arg) {
         try {
-          var info3 = gen[key](arg);
-          var value = info3.value;
+          var info4 = gen[key](arg);
+          var value = info4.value;
         } catch (error2) {
           reject(error2);
           return;
         }
-        if (info3.done) {
+        if (info4.done) {
           resolve2(value);
         } else {
           Promise.resolve(value).then(_next, _throw);
@@ -14475,7 +14481,7 @@ var init_utils4 = __esm({
       }
       const tablesFilterConfig = config.tablesFilter;
       const tablesFilter = tablesFilterConfig ? typeof tablesFilterConfig === "string" ? [tablesFilterConfig] : tablesFilterConfig : [];
-      const schemasFilterConfig = config.schemaFilters;
+      const schemasFilterConfig = config.schemaFilter;
       const schemasFilter = schemasFilterConfig ? typeof schemasFilterConfig === "string" ? [schemasFilterConfig] : schemasFilterConfig : [];
       if (dialect7 === "postgresql") {
         const parsed = postgresCredentials.safeParse(config);
@@ -19673,7 +19679,7 @@ var init_snapshotsDiffer = __esm({
       const jsonTableAlternations = alteredTables.map((it) => {
         return preparePgAlterColumns(it.name, it.schema, it.altered, json2);
       }).flat();
-      const jsonCreateIndexesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateIndexesFoAlteredTables = alteredTables.map((it) => {
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
@@ -19702,14 +19708,21 @@ var init_snapshotsDiffer = __esm({
           },
           {}
         );
-        jsonCreateIndexesForAllAlteredTables.push(
+        jsonCreateIndexesFoAlteredTables.push(
           ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
-      const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
+      const jsonReferencesForAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
           it.schema,
@@ -19727,10 +19740,10 @@ var init_snapshotsDiffer = __esm({
         );
         return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
-      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "create_reference"
       );
-      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "delete_reference"
       );
       const createEnums = createdEnums.map((it) => {
@@ -19757,7 +19770,7 @@ var init_snapshotsDiffer = __esm({
       const dropSchemas = prepareDeleteSchemasJson(
         deletedSchemas.map((it) => it.name)
       );
-      const jsonPgCreateTables = createdTables.map((it) => {
+      const createTables = createdTables.map((it) => {
         return preparePgCreateTableJson(it, curFull);
       });
       jsonStatements.push(...createSchemas);
@@ -19766,7 +19779,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...moveEnums);
       jsonStatements.push(...renameEnums);
       jsonStatements.push(...jsonAlterEnumsWithAddedValues);
-      jsonStatements.push(...jsonPgCreateTables);
+      jsonStatements.push(...createTables);
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...jsonRenameTables);
@@ -19777,9 +19790,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesFoAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
@@ -20038,6 +20052,13 @@ var init_snapshotsDiffer = __esm({
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
       const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
@@ -20078,9 +20099,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonDeletedUniqueConstraints);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -28283,7 +28305,7 @@ var require_partial = __commonJS({
       match(filepath) {
         const parts = filepath.split("/");
         const levels = parts.length;
-        const patterns = this._storage.filter((info3) => !info3.complete || info3.segments.length > levels);
+        const patterns = this._storage.filter((info4) => !info4.complete || info4.segments.length > levels);
         for (const pattern of patterns) {
           const section = pattern.sections[0];
           if (!pattern.complete && levels > section.length) {
@@ -36936,14 +36958,14 @@ var init_dist = __esm({
     if (typeof global.crypto === "undefined") {
       global.crypto = import_crypto2.default;
     }
-    global.fetch = (info3, init2) => {
+    global.fetch = (info4, init2) => {
       init2 = {
         // Disable compression handling so people can return the result of a fetch
         // directly in the loader without messing with the Content-Encoding header.
         compress: false,
         ...init2
       };
-      return webFetch(info3, init2);
+      return webFetch(info4, init2);
     };
     regBuffer = /^no$/i;
     regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
@@ -43593,13 +43615,13 @@ var require_websocket_server = __commonJS({
           }
         }
         if (this.options.verifyClient) {
-          const info3 = {
+          const info4 = {
             origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
             secure: !!(req.socket.authorized || req.socket.encrypted),
             req
           };
           if (this.options.verifyClient.length === 2) {
-            this.options.verifyClient(info3, (verified, code, message, headers) => {
+            this.options.verifyClient(info4, (verified, code, message, headers) => {
               if (!verified) {
                 return abortHandshake(socket, code || 401, message, headers);
               }
@@ -43615,7 +43637,7 @@ var require_websocket_server = __commonJS({
             });
             return;
           }
-          if (!this.options.verifyClient(info3))
+          if (!this.options.verifyClient(info4))
             return abortHandshake(socket, 401);
         }
         this.completeUpgrade(extensions, key, protocols, req, socket, head, cb);
@@ -83218,13 +83240,13 @@ var require_websocket_server2 = __commonJS({
           }
         }
         if (this.options.verifyClient) {
-          const info3 = {
+          const info4 = {
             origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
             secure: !!(req.socket.authorized || req.socket.encrypted),
             req
           };
           if (this.options.verifyClient.length === 2) {
-            this.options.verifyClient(info3, (verified, code, message, headers) => {
+            this.options.verifyClient(info4, (verified, code, message, headers) => {
               if (!verified) {
                 return abortHandshake(socket, code || 401, message, headers);
               }
@@ -83240,7 +83262,7 @@ var require_websocket_server2 = __commonJS({
             });
             return;
           }
-          if (!this.options.verifyClient(info3))
+          if (!this.options.verifyClient(info4))
             return abortHandshake(socket, 401);
         }
         this.completeUpgrade(extensions, key, protocols, req, socket, head, cb);
@@ -99658,7 +99680,7 @@ __export(connections_exports, {
   connectToSQLite: () => connectToSQLite,
   preparePostgresDB: () => preparePostgresDB
 });
-var preparePostgresDB, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, connectToSQLite;
+var import_pg_core4, preparePostgresDB, parseMysqlCredentials, connectToMySQL, prepareSqliteParams, connectToSQLite;
 var init_connections = __esm({
   "src/cli/connections.ts"() {
     "use strict";
@@ -99666,143 +99688,37 @@ var init_connections = __esm({
     init_utils2();
     init_global();
     init_outputs();
+    import_pg_core4 = require("drizzle-orm/pg-core");
     preparePostgresDB = async (credentials2) => {
       if ("driver" in credentials2) {
         if (credentials2.driver === "aws-data-api") {
-          let getValueFromDataApi2 = function(field) {
-            if (field.stringValue !== void 0) {
-              return field.stringValue;
-            } else if (field.booleanValue !== void 0) {
-              return field.booleanValue;
-            } else if (field.doubleValue !== void 0) {
-              return field.doubleValue;
-            } else if (field.isNull !== void 0) {
-              return null;
-            } else if (field.longValue !== void 0) {
-              return field.longValue;
-            } else if (field.blobValue !== void 0) {
-              return field.blobValue;
-            } else if (field.arrayValue !== void 0) {
-              if (field.arrayValue.stringValues !== void 0) {
-                return field.arrayValue.stringValues;
-              }
-              if (field.arrayValue.longValues !== void 0) {
-                return field.arrayValue.longValues;
-              }
-              if (field.arrayValue.doubleValues !== void 0) {
-                return field.arrayValue.doubleValues;
-              }
-              if (field.arrayValue.booleanValues !== void 0) {
-                return field.arrayValue.booleanValues;
-              }
-              if (field.arrayValue.arrayValues !== void 0) {
-                return field.arrayValue.arrayValues;
-              }
-              throw new Error("Unknown array type");
-            } else {
-              throw new Error("Unknown type");
-            }
-          }, typingsToAwsTypeHint2 = function(typings) {
-            if (typings === "date") {
-              return TypeHint.DATE;
-            } else if (typings === "decimal") {
-              return TypeHint.DECIMAL;
-            } else if (typings === "json") {
-              return TypeHint.JSON;
-            } else if (typings === "time") {
-              return TypeHint.TIME;
-            } else if (typings === "timestamp") {
-              return TypeHint.TIMESTAMP;
-            } else if (typings === "uuid") {
-              return TypeHint.UUID;
-            } else {
-              return void 0;
-            }
-          }, toValueParam2 = function(value, typings) {
-            const response = {
-              value: {},
-              typeHint: typingsToAwsTypeHint2(typings)
-            };
-            if (value === null) {
-              response.value = { isNull: true };
-            } else if (typeof value === "string") {
-              switch (response.typeHint) {
-                case TypeHint.DATE: {
-                  response.value = { stringValue: value.split("T")[0] };
-                  break;
-                }
-                case TypeHint.TIMESTAMP: {
-                  response.value = {
-                    stringValue: value.replace("T", " ").replace("Z", "")
-                  };
-                  break;
-                }
-                default: {
-                  response.value = { stringValue: value };
-                  break;
-                }
-              }
-            } else if (typeof value === "number" && Number.isInteger(value)) {
-              response.value = { longValue: value };
-            } else if (typeof value === "number" && !Number.isInteger(value)) {
-              response.value = { doubleValue: value };
-            } else if (typeof value === "boolean") {
-              response.value = { booleanValue: value };
-            } else if (value instanceof Date) {
-              response.value = {
-                stringValue: value.toISOString().replace("T", " ").replace("Z", "")
-              };
-            } else {
-              throw new Error(`Unknown type for ${value}`);
-            }
-            return response;
-          };
-          var getValueFromDataApi = getValueFromDataApi2, typingsToAwsTypeHint = typingsToAwsTypeHint2, toValueParam = toValueParam2;
           assertPackages("@aws-sdk/client-rds-data");
           const { RDSDataClient, ExecuteStatementCommand, TypeHint } = await Promise.resolve().then(() => __toESM(require_dist_cjs54()));
+          const { AwsDataApiSession } = await import("drizzle-orm/aws-data-api/pg");
           const rdsClient = new RDSDataClient();
-          const query = async (sql2, params = []) => {
-            var _a;
-            const result = await rdsClient.send(
-              new ExecuteStatementCommand({
-                sql: sql2,
-                parameters: params.map((param, index4) => ({
-                  name: `${index4 + 1}`,
-                  ...toValueParam2(param, void 0)
-                })),
-                secretArn: credentials2.secretArn,
-                resourceArn: credentials2.resourceArn,
-                database: credentials2.database
-              })
-            );
-            const rows = ((_a = result.records) == null ? void 0 : _a.map((row) => {
-              return row.map((field) => getValueFromDataApi2(field));
-            })) ?? [];
-            return rows;
-          };
-          const proxy = async (params) => {
-            var _a;
-            const result = await rdsClient.send(
-              new ExecuteStatementCommand({
-                sql: params.sql,
-                parameters: params.params.map((param, index4) => ({
-                  name: `${index4 + 1}`,
-                  ...toValueParam2(param, void 0)
-                })),
-                secretArn: credentials2.secretArn,
-                resourceArn: credentials2.resourceArn,
-                database: credentials2.database
-              })
-            );
-            if (params.mode === "array") {
-              const rows = ((_a = result.records) == null ? void 0 : _a.map((row) => {
-                return row.map((field) => getValueFromDataApi2(field));
-              })) ?? [];
-              return rows;
+          const session = new AwsDataApiSession(
+            rdsClient,
+            new import_pg_core4.PgDialect(),
+            void 0,
+            {
+              database: credentials2.database,
+              resourceArn: credentials2.resourceArn,
+              secretArn: credentials2.secretArn
+            },
+            void 0
+          );
+          return {
+            async query(sql2, params) {
+              const prepared = session.prepareQuery({ sql: sql2, params: params ?? [] }, void 0, void 0, false);
+              const result = await prepared.execute();
+              return result;
+            },
+            async proxy(params) {
+              const prepared = session.prepareQuery({ sql: params.sql, params: params.params ?? [] }, void 0, void 0, params.mode === "array");
+              const result = await prepared.execute();
+              return result;
             }
-            return result.records;
           };
-          return { query, proxy };
         }
         assertUnreachable(credentials2.driver);
       }
@@ -99851,7 +99767,7 @@ var init_connections = __esm({
         );
         console.log(
           withStyle.fullWarning(
-            "'@neondatabase/serverless' connects through a websocket only to remote Neon instance"
+            "'@neondatabase/serverless' can only connect to remote Neon/Vercel Postgres/Supabase instances through a websocket"
           )
         );
         const { Client: Client2 } = await Promise.resolve().then(() => (init_serverless(), serverless_exports));
@@ -99878,7 +99794,7 @@ var init_connections = __esm({
         );
         console.log(
           withStyle.fullWarning(
-            "'@vercel/postgres' connects through a websocket only to remote Vercel Postgres instance"
+            "'@vercel/postgres' can only connect to remote Neon/Vercel Postgres/Supabase instances through a websocket"
           )
         );
         const { Client: Client2 } = await Promise.resolve().then(() => (init_index_node(), index_node_exports));
@@ -100084,7 +100000,7 @@ __export(studio_exports, {
   prepareSQLiteSchema: () => prepareSQLiteSchema,
   prepareServer: () => prepareServer
 });
-var import_node_https, import_pg_core4, import_drizzle_orm8, import_mysql_core4, import_sqlite_core3, preparePgSchema, prepareMySqlSchema, prepareSQLiteSchema, getCustomDefaults, drizzleForPostgres, drizzleForMySQL, drizzleForSQLite, init, proxySchema, defaultsSchema, schema4, jsonStringify, prepareServer;
+var import_node_https, import_pg_core5, import_drizzle_orm8, import_mysql_core4, import_sqlite_core3, preparePgSchema, prepareMySqlSchema, prepareSQLiteSchema, getCustomDefaults, drizzleForPostgres, drizzleForMySQL, drizzleForSQLite, init, proxySchema, defaultsSchema, schema4, jsonStringify, prepareServer;
 var init_studio = __esm({
   "src/serializer/studio.ts"() {
     "use strict";
@@ -100096,7 +100012,7 @@ var init_studio = __esm({
     init_dist5();
     init_lib();
     init_serializer();
-    import_pg_core4 = require("drizzle-orm/pg-core");
+    import_pg_core5 = require("drizzle-orm/pg-core");
     import_drizzle_orm8 = require("drizzle-orm");
     init_utils4();
     import_mysql_core4 = require("drizzle-orm/mysql-core");
@@ -100111,8 +100027,8 @@ var init_studio = __esm({
         const i0 = require(`${it}`);
         const i0values = Object.entries(i0);
         i0values.forEach(([k2, t]) => {
-          if ((0, import_drizzle_orm8.is)(t, import_pg_core4.PgTable)) {
-            const schema5 = (0, import_pg_core4.getTableConfig)(t).schema || "public";
+          if ((0, import_drizzle_orm8.is)(t, import_pg_core5.PgTable)) {
+            const schema5 = (0, import_pg_core5.getTableConfig)(t).schema || "public";
             pgSchema2[schema5] = pgSchema2[schema5] || {};
             pgSchema2[schema5][k2] = t;
           }
@@ -100177,8 +100093,8 @@ var init_studio = __esm({
       Object.entries(schema5).map(([schema6, tables]) => {
         Object.entries(tables).map(([, table4]) => {
           let tableConfig;
-          if ((0, import_drizzle_orm8.is)(table4, import_pg_core4.PgTable)) {
-            tableConfig = (0, import_pg_core4.getTableConfig)(table4);
+          if ((0, import_drizzle_orm8.is)(table4, import_pg_core5.PgTable)) {
+            tableConfig = (0, import_pg_core5.getTableConfig)(table4);
           } else if ((0, import_drizzle_orm8.is)(table4, import_mysql_core4.MySqlTable)) {
             tableConfig = (0, import_mysql_core4.getTableConfig)(table4);
           } else {
@@ -103733,7 +103649,7 @@ import { sql } from "drizzle-orm"
 });
 
 // src/introspect-pg.ts
-var import_drizzle_orm9, import_relations, pgImportsList, objToStatement23, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch2, relations3, withCasing2, schemaToTypeScript3, isCyclic3, isSelf3, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
+var import_drizzle_orm9, import_relations, pgImportsList, objToStatement23, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch2, relations3, withCasing2, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
 var init_introspect_pg = __esm({
   "src/introspect-pg.ts"() {
     "use strict";
@@ -103858,6 +103774,10 @@ var init_introspect_pg = __esm({
       }
       assertUnreachable(casing2);
     };
+    paramNameFor = (name, schema5) => {
+      const schemaSuffix = schema5 && schema5 !== "public" ? `In${schema5.capitalise()}` : "";
+      return `${name}${schemaSuffix}`;
+    };
     schemaToTypeScript3 = (schema5, casing2) => {
       Object.values(schema5.tables).forEach((table4) => {
         Object.values(table4.foreignKeys).forEach((fk4) => {
@@ -103914,7 +103834,7 @@ var init_introspect_pg = __esm({
       );
       const enumStatements = Object.values(schema5.enums).map((it) => {
         const enumSchema3 = schemas[it.schema];
-        const paramName = !enumSchema3 || enumSchema3 === "public" ? it.name : `${it.name}In${enumSchema3}`;
+        const paramName = paramNameFor(it.name, enumSchema3);
         const func = enumSchema3 ? `${enumSchema3}.enum` : "pgEnum";
         const values2 = Object.values(it.values).map((it2) => `'${it2}'`).join(", ");
         return `export const ${withCasing2(paramName, casing2)} = ${func}("${it.name}", [${values2}])
@@ -103926,7 +103846,7 @@ var init_introspect_pg = __esm({
       }).join("");
       const tableStatements = Object.values(schema5.tables).map((table4) => {
         const tableSchema = schemas[table4.schema];
-        const paramName = !tableSchema || tableSchema === "public" ? table4.name : `${table4.name}In${tableSchema}`;
+        const paramName = paramNameFor(table4.name, tableSchema);
         const func = tableSchema ? `${tableSchema}.table` : "pgTable";
         let statement = `export const ${withCasing2(paramName, casing2)} = ${func}("${table4.name}", {
 `;
@@ -103935,6 +103855,7 @@ var init_introspect_pg = __esm({
           Object.values(table4.columns),
           Object.values(table4.foreignKeys),
           enumTypes,
+          schemas,
           casing2,
           schema5.internal
         );
@@ -103951,7 +103872,7 @@ var init_introspect_pg = __esm({
             Object.values(table4.indexes),
             casing2
           );
-          statement += createTableFKs3(Object.values(filteredFKs), casing2);
+          statement += createTableFKs3(Object.values(filteredFKs), schemas, casing2);
           statement += createTablePKs3(
             Object.values(table4.compositePrimaryKeys),
             casing2
@@ -103973,8 +103894,8 @@ var init_introspect_pg = __esm({
   import { sql } from "drizzle-orm"
 
 `;
-      let decalrations = enumStatements;
-      decalrations += schemaStatements;
+      let decalrations = schemaStatements;
+      decalrations += enumStatements;
       decalrations += "\n";
       decalrations += tableStatements.join("\n\n");
       const file = importsTs + decalrations;
@@ -104201,7 +104122,7 @@ var init_introspect_pg = __esm({
       }
       return res;
     };
-    createTableColumns3 = (tableName, columns, fks, enumTypes, casing2, internals) => {
+    createTableColumns3 = (tableName, columns, fks, enumTypes, schemas, casing2, internals) => {
       let statement = "";
       const oneColumnsFKs = Object.values(fks).filter((it) => {
         return !isSelf3(it);
@@ -104240,14 +104161,16 @@ var init_introspect_pg = __esm({
             const params = { onDelete, onUpdate };
             const typeSuffix = isCyclic3(it2) ? ": AnyPgColumn" : "";
             const paramsStr = objToStatement23(params);
+            const tableSchema = schemas[it2.schemaTo || ""];
+            const paramName = paramNameFor(it2.tableTo, tableSchema);
             if (paramsStr) {
               return `.references(()${typeSuffix} => ${withCasing2(
-                it2.tableTo,
+                paramName,
                 casing2
               )}.${withCasing2(it2.columnsTo[0], casing2)}, ${paramsStr} )`;
             }
             return `.references(()${typeSuffix} => ${withCasing2(
-              it2.tableTo,
+              paramName,
               casing2
             )}.${withCasing2(it2.columnsTo[0], casing2)})`;
           }).join("");
@@ -104303,11 +104226,13 @@ var init_introspect_pg = __esm({
       });
       return statement;
     };
-    createTableFKs3 = (fks, casing2) => {
+    createTableFKs3 = (fks, schemas, casing2) => {
       let statement = "";
       fks.forEach((it) => {
+        const tableSchema = schemas[it.schemaTo || ""];
+        const paramName = paramNameFor(it.tableTo, tableSchema);
         const isSelf4 = it.tableTo === it.tableFrom;
-        const tableTo = isSelf4 ? "table" : `${withCasing2(it.tableTo, casing2)}`;
+        const tableTo = isSelf4 ? "table" : `${withCasing2(paramName, casing2)}`;
         statement += `		${withCasing2(it.name, casing2)}: foreignKey({
 `;
         statement += `			columns: [${it.columnsFrom.map((i) => `table.${withCasing2(i, casing2)}`).join(", ")}],
@@ -104946,8 +104871,10 @@ var init_introspect = __esm({
       const tableRelations = {};
       Object.values(schema5.tables).forEach((table4) => {
         Object.values(table4.foreignKeys).forEach((fk4) => {
-          const tableFrom = withCasing3(fk4.tableFrom, casing2);
-          const tableTo = withCasing3(fk4.tableTo, casing2);
+          const tableNameFrom = paramNameFor(fk4.tableFrom, table4.schema);
+          const tableNameTo = paramNameFor(fk4.tableTo, fk4.schemaTo);
+          const tableFrom = withCasing3(tableNameFrom, casing2);
+          const tableTo = withCasing3(tableNameTo, casing2);
           const columnFrom = withCasing3(fk4.columnsFrom[0], casing2);
           const columnTo = withCasing3(fk4.columnsTo[0], casing2);
           imports.push(tableTo, tableFrom);
@@ -106489,6 +106416,11 @@ var pullCommand = new import_commander.Command("introspect").option("--config <c
     tablesFilter,
     schemasFilter
   } = await preparePullConfig(options);
+  console.log(
+    grey(
+      `Pulling from [${schemasFilter.map((it) => `'${it}'`).join(", ")}] list of schemas`
+    )
+  );
   try {
     if (dialect7 === "postgresql") {
       const { introspectPostgres: introspectPostgres2 } = await Promise.resolve().then(() => (init_introspect(), introspect_exports));
@@ -106617,8 +106549,8 @@ Drizzle Studio is up and running on ${source_default.blue(
     });
   } catch (e) {
     console.error(e);
+    process.exit(0);
   }
-  process.exit(0);
 });
 var main = async () => {
   const version2 = await versions();

package/cli/validations/cli.d.ts

@@ -29,7 +29,7 @@ export declare const pushParams: import("zod").ZodObject<{
     dialect: import("zod").ZodEnum<["postgresql", "mysql", "sqlite"]>;
     schema: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
-    schemaFilters: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>>;
+    schemaFilter: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>>;
     driver: import("zod").ZodOptional<import("zod").ZodString>;
     connectionString: import("zod").ZodOptional<import("zod").ZodString>;
     uri: import("zod").ZodOptional<import("zod").ZodString>;
@@ -60,7 +60,7 @@ export declare const pushParams: import("zod").ZodObject<{
     tablesFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
     dialect: "mysql" | "postgresql" | "sqlite";
-    schemaFilters: string | string[];
+    schemaFilter: string | string[];
 }, {
     strict?: boolean | undefined;
     schema?: string | string[] | undefined;
@@ -76,8 +76,8 @@ export declare const pushParams: import("zod").ZodObject<{
     ssl?: string | undefined;
     authToken?: string | undefined;
     tablesFilter?: string | string[] | undefined;
+    schemaFilter?: string | string[] | undefined;
     verbose?: boolean | undefined;
-    schemaFilters?: string | string[] | undefined;
     dialect: "mysql" | "postgresql" | "sqlite";
 }>;
 export type PushParams = TypeOf<typeof pushParams>;
@@ -100,7 +100,7 @@ export declare const pullParams: import("zod").ZodObject<{
     authToken: import("zod").ZodOptional<import("zod").ZodString>;
     introspectCasing: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodLiteral<"camel">, import("zod").ZodLiteral<"preserve">]>>;
     breakpoints: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodBoolean>>;
-}, "strip", import("zod").ZodTypeAny, {
+}, "passthrough", import("zod").ZodTypeAny, {
     dialect?: "mysql" | "postgresql" | "sqlite" | undefined;
     url?: string | undefined;
     host?: string | undefined;

package/cli/views.d.ts

@@ -4,6 +4,7 @@ import type { Named, NamedWithSchema } from "./commands/migrate";
 export declare const warning: (msg: string) => void;
 export declare const err: (msg: string) => void;
 export declare const info: (msg: string, greyMsg?: string) => string;
+export declare const grey: (msg: string) => string;
 export declare const error: (error: string, greyMsg?: string) => string;
 export declare const schema: (schema: CommonSchema) => string;
 export interface RenamePropmtItem<T> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.17-c057923",
+  "version": "0.20.17-c8aaf94",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -5511,7 +5511,7 @@ var init_cli = __esm({
       dialect: dialect3,
       schema: unionType([stringType(), stringType().array()]).optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilters: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
       driver: stringType().optional(),
       // pg
       connectionString: stringType().optional(),
@@ -5550,7 +5550,7 @@ var init_cli = __esm({
       authToken: stringType().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true)
-    });
+    }).passthrough();
     configCheck = objectType({
       dialect: dialect3.optional(),
       out: stringType().optional()
@@ -15088,7 +15088,7 @@ var init_snapshotsDiffer = __esm({
       const jsonTableAlternations = alteredTables.map((it) => {
         return preparePgAlterColumns(it.name, it.schema, it.altered, json2);
       }).flat();
-      const jsonCreateIndexesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateIndexesFoAlteredTables = alteredTables.map((it) => {
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
@@ -15117,14 +15117,21 @@ var init_snapshotsDiffer = __esm({
           },
           {}
         );
-        jsonCreateIndexesForAllAlteredTables.push(
+        jsonCreateIndexesFoAlteredTables.push(
           ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
-      const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
+      const jsonReferencesForAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
           it.schema,
@@ -15142,10 +15149,10 @@ var init_snapshotsDiffer = __esm({
         );
         return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
-      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "create_reference"
       );
-      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "delete_reference"
       );
       const createEnums = createdEnums.map((it) => {
@@ -15172,7 +15179,7 @@ var init_snapshotsDiffer = __esm({
       const dropSchemas = prepareDeleteSchemasJson(
         deletedSchemas.map((it) => it.name)
       );
-      const jsonPgCreateTables = createdTables.map((it) => {
+      const createTables = createdTables.map((it) => {
         return preparePgCreateTableJson(it, curFull);
       });
       jsonStatements.push(...createSchemas);
@@ -15181,7 +15188,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...moveEnums);
       jsonStatements.push(...renameEnums);
       jsonStatements.push(...jsonAlterEnumsWithAddedValues);
-      jsonStatements.push(...jsonPgCreateTables);
+      jsonStatements.push(...createTables);
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...jsonRenameTables);
@@ -15192,9 +15199,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesFoAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
@@ -15453,6 +15461,13 @@ var init_snapshotsDiffer = __esm({
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
       const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
@@ -15493,9 +15508,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonDeletedUniqueConstraints);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -19048,6 +19064,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/payload.mjs

@@ -5517,7 +5517,7 @@ var init_cli = __esm({
       dialect: dialect3,
       schema: unionType([stringType(), stringType().array()]).optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilters: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
       driver: stringType().optional(),
       // pg
       connectionString: stringType().optional(),
@@ -5556,7 +5556,7 @@ var init_cli = __esm({
       authToken: stringType().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true)
-    });
+    }).passthrough();
     configCheck = objectType({
       dialect: dialect3.optional(),
       out: stringType().optional()
@@ -15102,7 +15102,7 @@ var init_snapshotsDiffer = __esm({
       const jsonTableAlternations = alteredTables.map((it) => {
         return preparePgAlterColumns(it.name, it.schema, it.altered, json2);
       }).flat();
-      const jsonCreateIndexesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateIndexesFoAlteredTables = alteredTables.map((it) => {
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
@@ -15131,14 +15131,21 @@ var init_snapshotsDiffer = __esm({
           },
           {}
         );
-        jsonCreateIndexesForAllAlteredTables.push(
+        jsonCreateIndexesFoAlteredTables.push(
           ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
-      const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
+      const jsonReferencesForAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
           it.schema,
@@ -15156,10 +15163,10 @@ var init_snapshotsDiffer = __esm({
         );
         return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
-      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "create_reference"
       );
-      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "delete_reference"
       );
       const createEnums = createdEnums.map((it) => {
@@ -15186,7 +15193,7 @@ var init_snapshotsDiffer = __esm({
       const dropSchemas = prepareDeleteSchemasJson(
         deletedSchemas.map((it) => it.name)
       );
-      const jsonPgCreateTables = createdTables.map((it) => {
+      const createTables = createdTables.map((it) => {
         return preparePgCreateTableJson(it, curFull);
       });
       jsonStatements.push(...createSchemas);
@@ -15195,7 +15202,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...moveEnums);
       jsonStatements.push(...renameEnums);
       jsonStatements.push(...jsonAlterEnumsWithAddedValues);
-      jsonStatements.push(...jsonPgCreateTables);
+      jsonStatements.push(...createTables);
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...jsonRenameTables);
@@ -15206,9 +15213,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesFoAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
@@ -15467,6 +15475,13 @@ var init_snapshotsDiffer = __esm({
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
       const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
@@ -15507,9 +15522,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonDeletedUniqueConstraints);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -19057,6 +19073,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/utils-studio.js

@@ -5933,6 +5933,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/utils-studio.mjs

@@ -5969,6 +5969,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };