drizzle-kit 0.24.0-6205f01 → 0.24.0-8d86512

package/bin.cjs

@@ -5687,11 +5687,30 @@ var init_mysqlSchema = __esm({
   }
 });
 
+// src/extensions/vector.ts
+var vectorOps;
+var init_vector = __esm({
+  "src/extensions/vector.ts"() {
+    "use strict";
+    vectorOps = [
+      "vector_l2_ops",
+      "vector_ip_ops",
+      "vector_cosine_ops",
+      "vector_l1_ops",
+      "bit_hamming_ops",
+      "bit_jaccard_ops",
+      "halfvec_l2_ops",
+      "sparsevec_l2_ops"
+    ];
+  }
+});
+
 // src/serializer/pgSchema.ts
 var indexV2, columnV2, tableV2, enumSchemaV1, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, indexColumn, index2, indexV4, indexV5, indexV6, fk2, sequenceSchema, sequenceSquashed, columnV7, column2, columnSquashed, tableV32, compositePK2, uniqueConstraint2, tableV42, tableV5, tableV6, tableV7, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaInternalV6, pgSchemaExternal, pgSchemaInternalV7, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashedV6, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchemaV6, pgSchemaV7, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
     "use strict";
+    init_vector();
     init_global();
     init_lib();
     indexV2 = objectType({
@@ -5938,7 +5957,8 @@ var init_pgSchema = __esm({
             objectType({
               isArray: booleanType().optional(),
               dimensions: numberType().optional(),
-              rawType: stringType().optional()
+              rawType: stringType().optional(),
+              isDefaultAnExpression: booleanType().optional()
             }).optional()
           )
         }).optional()
@@ -6076,7 +6096,7 @@ var init_pgSchema = __esm({
       squashIdx: (idx) => {
         index2.parse(idx);
         return `${idx.name};${idx.columns.map(
-          (c) => `${c.expression}--${c.isExpression}--${c.asc}--${c.nulls}--${c.opclass}`
+          (c) => `${c.expression}--${c.isExpression}--${c.asc}--${c.nulls}--${c.opclass && vectorOps.includes(c.opclass) ? c.opclass : ""}`
         ).join(",,")};${idx.isUnique};${idx.concurrently};${idx.method};${idx.where};${JSON.stringify(idx.with)}`;
       },
       unsquashIdx: (input) => {
@@ -11372,7 +11392,7 @@ var init_cli = __esm({
       extensionsFilters: literalType("postgis").array().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true),
-      database: objectType({
+      migrations: objectType({
         prefix: prefix.optional().default("index")
       }).optional()
     }).passthrough();
@@ -17510,7 +17530,7 @@ var init_utils4 = __esm({
           credentials: parsed2.data,
           tablesFilter,
           schemasFilter,
-          prefix: ((_a = config.database) == null ? void 0 : _a.prefix) || "index"
+          prefix: ((_a = config.migrations) == null ? void 0 : _a.prefix) || "index"
         };
       }
       if (dialect7 === "mysql") {
@@ -17527,7 +17547,7 @@ var init_utils4 = __esm({
           credentials: parsed2.data,
           tablesFilter,
           schemasFilter,
-          prefix: ((_b = config.database) == null ? void 0 : _b.prefix) || "index"
+          prefix: ((_b = config.migrations) == null ? void 0 : _b.prefix) || "index"
         };
       }
       if (dialect7 === "sqlite") {
@@ -17544,7 +17564,7 @@ var init_utils4 = __esm({
           credentials: parsed2.data,
           tablesFilter,
           schemasFilter,
-          prefix: ((_c = config.database) == null ? void 0 : _c.prefix) || "index"
+          prefix: ((_c = config.migrations) == null ? void 0 : _c.prefix) || "index"
         };
       }
       assertUnreachable(dialect7);
@@ -18372,24 +18392,6 @@ var init_pgImports = __esm({
   }
 });
 
-// src/extensions/vector.ts
-var vectorOps;
-var init_vector = __esm({
-  "src/extensions/vector.ts"() {
-    "use strict";
-    vectorOps = [
-      "vector_l2_ops",
-      "vector_ip_ops",
-      "vector_cosine_ops",
-      "vector_l1_ops",
-      "bit_hamming_ops",
-      "bit_jaccard_ops",
-      "halfvec_l2_ops",
-      "sparsevec_l2_ops"
-    ];
-  }
-});
-
 // src/serializer/pgSerializer.ts
 var pgSerializer_exports = {};
 __export(pgSerializer_exports, {
@@ -18433,7 +18435,7 @@ function buildArrayString(array, sqlType) {
   }).join(",");
   return `{${values}}`;
 }
-var import_drizzle_orm5, import_pg_core2, import_pg_core3, dialect5, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var import_drizzle_orm5, import_pg_core2, import_pg_core3, dialect5, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, columnEnumNameToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     "use strict";
@@ -18908,7 +18910,7 @@ ${withStyle.errorWarning(
                    WHEN 'int2'::regtype THEN 'smallserial'
                 END
            ELSE format_type(a.atttypid, a.atttypmod)
-           END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, 
+           END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, ns.nspname as type_schema,
            pg_get_serial_sequence('"${tableSchema}"."${tableName}"', a.attname)::regclass as seq_name, INFORMATION_SCHEMA.COLUMNS.column_name, 
            INFORMATION_SCHEMA.COLUMNS.column_default, INFORMATION_SCHEMA.COLUMNS.data_type as additional_dt, 
            INFORMATION_SCHEMA.COLUMNS.udt_name as enum_name,
@@ -18919,6 +18921,7 @@ ${withStyle.errorWarning(
            INFORMATION_SCHEMA.COLUMNS.identity_cycle
    FROM  pg_attribute  a
    JOIN INFORMATION_SCHEMA.COLUMNS ON INFORMATION_SCHEMA.COLUMNS.column_name = a.attname
+   JOIN pg_type t ON t.oid = a.atttypid LEFT JOIN pg_namespace ns ON ns.oid = t.typnamespace
    WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}' and INFORMATION_SCHEMA.COLUMNS.table_schema = '${tableSchema}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
@@ -18938,30 +18941,42 @@ ${withStyle.errorWarning(
             }
             const tableForeignKeys = await db.query(
               `SELECT
-          tc.table_schema,
-          tc.constraint_name,
-          tc.table_name,
-          kcu.column_name,
-          (
-              SELECT ccu.table_schema
-              FROM information_schema.constraint_column_usage ccu
-              WHERE ccu.constraint_name = tc.constraint_name
-              LIMIT 1
-          ) AS foreign_table_schema,
-          ccu.table_name AS foreign_table_name,
-          ccu.column_name AS foreign_column_name,
-          rc.delete_rule, 
-          rc.update_rule
-      FROM
-          information_schema.table_constraints AS tc
-          JOIN information_schema.key_column_usage AS kcu
-            ON tc.constraint_name = kcu.constraint_name
-            AND tc.table_schema = kcu.table_schema
-          JOIN information_schema.constraint_column_usage AS ccu
-            ON ccu.constraint_name = tc.constraint_name
-          JOIN information_schema.referential_constraints AS rc
-            ON ccu.constraint_name = rc.constraint_name
-    WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='${tableName}' and tc.table_schema='${tableSchema}';`
+            con.contype AS constraint_type,
+            nsp.nspname AS constraint_schema,
+            con.conname AS constraint_name,
+            rel.relname AS table_name,
+            att.attname AS column_name,
+            fnsp.nspname AS foreign_table_schema,
+            frel.relname AS foreign_table_name,
+            fatt.attname AS foreign_column_name,
+            CASE con.confupdtype
+              WHEN 'a' THEN 'NO ACTION'
+              WHEN 'r' THEN 'RESTRICT'
+              WHEN 'n' THEN 'SET NULL'
+              WHEN 'c' THEN 'CASCADE'
+              WHEN 'd' THEN 'SET DEFAULT'
+            END AS update_rule,
+            CASE con.confdeltype
+              WHEN 'a' THEN 'NO ACTION'
+              WHEN 'r' THEN 'RESTRICT'
+              WHEN 'n' THEN 'SET NULL'
+              WHEN 'c' THEN 'CASCADE'
+              WHEN 'd' THEN 'SET DEFAULT'
+            END AS delete_rule
+          FROM
+            pg_catalog.pg_constraint con
+            JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
+            JOIN pg_catalog.pg_namespace nsp ON nsp.oid = con.connamespace
+            LEFT JOIN pg_catalog.pg_attribute att ON att.attnum = ANY (con.conkey)
+              AND att.attrelid = con.conrelid
+            LEFT JOIN pg_catalog.pg_class frel ON frel.oid = con.confrelid
+            LEFT JOIN pg_catalog.pg_namespace fnsp ON fnsp.oid = frel.relnamespace
+            LEFT JOIN pg_catalog.pg_attribute fatt ON fatt.attnum = ANY (con.confkey)
+              AND fatt.attrelid = con.confrelid
+          WHERE
+            nsp.nspname = '${tableSchema}'
+            AND rel.relname = '${tableName}'
+            AND con.contype IN ('f');`
             );
             foreignKeysCount += tableForeignKeys.length;
             if (progressCallback) {
@@ -19019,6 +19034,7 @@ ${withStyle.errorWarning(
               const columnDimensions = columnResponse.array_dimensions;
               const enumType2 = columnResponse.enum_name;
               let columnType = columnResponse.data_type;
+              const typeSchema = columnResponse.type_schema;
               const isGenerated = columnResponse.is_generated === "ALWAYS";
               const generationExpression = columnResponse.generation_expression;
               const isIdentity = columnResponse.is_identity === "YES";
@@ -19050,6 +19066,25 @@ ${withStyle.errorWarning(
                 };
               }
               const defaultValue = defaultForColumn(columnResponse);
+              if (defaultValue === "NULL") {
+                if (typeof internals.tables[tableName] === "undefined") {
+                  internals.tables[tableName] = {
+                    columns: {
+                      [columnName]: {
+                        isDefaultAnExpression: true
+                      }
+                    }
+                  };
+                } else {
+                  if (typeof internals.tables[tableName].columns[columnName] === "undefined") {
+                    internals.tables[tableName].columns[columnName] = {
+                      isDefaultAnExpression: true
+                    };
+                  } else {
+                    internals.tables[tableName].columns[columnName].isDefaultAnExpression = true;
+                  }
+                }
+              }
               const isSerial = columnType === "serial";
               let columnTypeMapped = columnType;
               if (columnTypeMapped.startsWith("numeric(")) {
@@ -19095,7 +19130,7 @@ ${withStyle.errorWarning(
                   // filter vectors, but in future we should filter any extension that was installed by user
                   columnAdditionalDT === "USER-DEFINED" && !["vector", "geometry"].includes(enumType2) ? enumType2 : columnTypeMapped
                 ),
-                typeSchema: enumsToReturn[`${tableSchema}.${enumType2}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType2}`].schema : void 0,
+                typeSchema: enumsToReturn[`${typeSchema}.${enumType2}`] !== void 0 ? enumsToReturn[`${typeSchema}.${enumType2}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,
                 // default: isSerial ? undefined : defaultValue,
                 notNull: columnResponse.is_nullable === "NO",
@@ -19270,11 +19305,11 @@ ${withStyle.errorWarning(
     columnToDefault = {
       "numeric(": "::numeric",
       // text: "::text",
-      // "character varying": "::character varying",
+      "character varying": "::character varying",
       // "double precision": "::double precision",
       // "time with time zone": "::time with time zone",
       "time without time zone": "::time without time zone",
-      // "timestamp with time zone": "::timestamp with time zone",
+      // 'timestamp with time zone': '::timestamp with time zone',
       "timestamp without time zone": "::timestamp without time zone",
       "timestamp(": "::timestamp without time zone",
       // date: "::date",
@@ -19288,6 +19323,12 @@ ${withStyle.errorWarning(
       // json: "::json",
       "character(": "::bpchar"
     };
+    columnEnumNameToDefault = {
+      timestamptz: "::timestamp with time zone",
+      timestmap: "::time without time zone",
+      time: "::time without time zone",
+      timetz: "::time with time zone"
+    };
     defaultForColumn = (column7) => {
       if (column7.column_default === null) {
         return void 0;
@@ -19296,19 +19337,33 @@ ${withStyle.errorWarning(
         return void 0;
       }
       const hasDifferentDefaultCast = Object.keys(columnToDefault).find((it) => column7.data_type.startsWith(it));
+      const hasDifferentDefaultCastForEnum = Object.keys(columnEnumNameToDefault).find(
+        (it) => column7.enum_name.startsWith(it)
+      );
       const columnDefaultAsString = column7.column_default.toString();
-      if (columnDefaultAsString.endsWith(
+      const endsWithEnumName = columnDefaultAsString.endsWith(
+        hasDifferentDefaultCastForEnum ? columnEnumNameToDefault[hasDifferentDefaultCastForEnum] : column7.data_type
+      );
+      const endsWithTypeName = columnDefaultAsString.endsWith(
         hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : column7.data_type
-      )) {
+      );
+      if (endsWithTypeName || endsWithEnumName) {
         const nonPrefixPart = column7.column_default.length - (hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column7.data_type}`).length - 1;
-        const rt = column7.column_default.toString().substring(1, nonPrefixPart);
+        let rt = column7.column_default.toString().substring(0, nonPrefixPart + 1);
         if (/^-?[\d.]+(?:e-?\d+)?$/.test(rt) && !column7.data_type.startsWith("numeric")) {
           return Number(rt);
         } else if (column7.data_type === "json" || column7.data_type === "jsonb") {
+          if (rt.startsWith("'")) {
+            rt = rt.slice(1, -1);
+          }
           const jsonWithoutSpaces = JSON.stringify(JSON.parse(rt));
           return `'${jsonWithoutSpaces}'${hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column7.data_type}`}`;
         } else if (column7.data_type === "boolean") {
           return column7.column_default === "true";
+        } else if (rt === "NULL") {
+          return `NULL`;
+        } else if (rt.startsWith("'") && rt.endsWith("'")) {
+          return rt;
         } else {
           return `'${rt}'`;
         }
@@ -19317,8 +19372,10 @@ ${withStyle.errorWarning(
           return Number(columnDefaultAsString);
         } else if (column7.data_type === "boolean") {
           return column7.column_default === "true";
+        } else if (columnDefaultAsString === "NULL") {
+          return `NULL`;
         } else {
-          return `${columnDefaultAsString}`;
+          return `${columnDefaultAsString.replace(/\\/g, "`\\")}`;
         }
       }
     };
@@ -74154,7 +74211,7 @@ var init_pgIntrospect = __esm({
 });
 
 // src/introspect-sqlite.ts
-var sqliteImportsList, indexName3, objToStatement2, relations, withCasing, schemaToTypeScript, isCyclic, isSelf, mapColumnDefault, column4, createTableColumns, createTableIndexes, createTableUniques, createTablePKs, createTableFKs;
+var sqliteImportsList, indexName3, objToStatement2, relations, escapeColumnKey, withCasing, schemaToTypeScript, isCyclic, isSelf, mapColumnDefault, column4, createTableColumns, createTableIndexes, createTableUniques, createTablePKs, createTableFKs;
 var init_introspect_sqlite = __esm({
   "src/introspect-sqlite.ts"() {
     "use strict";
@@ -74181,12 +74238,18 @@ var init_introspect_sqlite = __esm({
       return statement;
     };
     relations = /* @__PURE__ */ new Set();
+    escapeColumnKey = (value) => {
+      if (/^(?![a-zA-Z_$][a-zA-Z0-9_$]*$).+$/.test(value)) {
+        return `"${value}"`;
+      }
+      return value;
+    };
     withCasing = (value, casing2) => {
-      if (typeof casing2 === "undefined") {
-        return value;
+      if (casing2 === "preserve") {
+        return escapeColumnKey(value);
       }
       if (casing2 === "camel") {
-        return value.camelCase();
+        return escapeColumnKey(value.camelCase());
       }
       return value;
     };
@@ -75184,7 +75247,7 @@ var require_pluralize = __commonJS({
 });
 
 // src/introspect-mysql.ts
-var mysqlImportsList, objToStatement22, timeConfig, binaryConfig, importsPatch, relations2, prepareCasing, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault2, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
+var mysqlImportsList, objToStatement22, timeConfig, binaryConfig, importsPatch, relations2, escapeColumnKey2, prepareCasing, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault2, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
 var init_introspect_mysql = __esm({
   "src/introspect-mysql.ts"() {
     "use strict";
@@ -75255,14 +75318,20 @@ var init_introspect_mysql = __esm({
       "timestamp without time zone": "timestamp"
     };
     relations2 = /* @__PURE__ */ new Set();
+    escapeColumnKey2 = (value) => {
+      if (/^(?![a-zA-Z_$][a-zA-Z0-9_$]*$).+$/.test(value)) {
+        return `"${value}"`;
+      }
+      return value;
+    };
     prepareCasing = (casing2) => (value) => {
-      if (typeof casing2 === "undefined") {
-        return value;
+      if (casing2 === "preserve") {
+        return escapeColumnKey2(value);
       }
       if (casing2 === "camel") {
-        return value.camelCase();
+        return escapeColumnKey2(value.camelCase());
       }
-      return value;
+      return escapeColumnKey2(value);
     };
     schemaToTypeScript2 = (schema5, casing2) => {
       const withCasing4 = prepareCasing(casing2);
@@ -75728,7 +75797,7 @@ import { sql } from "drizzle-orm"
 });
 
 // src/introspect-pg.ts
-var import_drizzle_orm8, import_relations, pgImportsList, objToStatement23, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch2, relations3, withCasing2, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
+var import_drizzle_orm8, import_relations, pgImportsList, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, mapColumnDefault3, importsPatch2, relations3, escapeColumnKey3, withCasing2, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
 var init_introspect_pg = __esm({
   "src/introspect-pg.ts"() {
     "use strict";
@@ -75772,16 +75841,6 @@ var init_introspect_pg = __esm({
       "line",
       "geometry"
     ]);
-    objToStatement23 = (json) => {
-      json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
-      const keys = Object.keys(json);
-      if (keys.length === 0)
-        return;
-      let statement = "{ ";
-      statement += keys.map((it) => `${it}: "${json[it]}"`).join(", ");
-      statement += " }";
-      return statement;
-    };
     timeConfig2 = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
       const keys = Object.keys(json);
@@ -75841,6 +75900,12 @@ var init_introspect_pg = __esm({
       statement += " }";
       return statement;
     };
+    mapColumnDefault3 = (defaultValue, isExpression) => {
+      if (isExpression) {
+        return `sql\`${defaultValue}\``;
+      }
+      return defaultValue;
+    };
     importsPatch2 = {
       "double precision": "doublePrecision",
       "timestamp without time zone": "timestamp",
@@ -75849,12 +75914,18 @@ var init_introspect_pg = __esm({
       "time with time zone": "time"
     };
     relations3 = /* @__PURE__ */ new Set();
+    escapeColumnKey3 = (value) => {
+      if (/^(?![a-zA-Z_$][a-zA-Z0-9_$]*$).+$/.test(value)) {
+        return `"${value}"`;
+      }
+      return value;
+    };
     withCasing2 = (value, casing2) => {
       if (casing2 === "preserve") {
-        return value;
+        return escapeColumnKey3(value);
       }
       if (casing2 === "camel") {
-        return value.camelCase();
+        return escapeColumnKey3(value.camelCase());
       }
       assertUnreachable(casing2);
     };
@@ -75874,7 +75945,13 @@ var init_introspect_pg = __esm({
           return [it[0], withCasing2(it[1], casing2)];
         })
       );
-      const enumTypes = new Set(Object.values(schema5.enums).map((it) => it.name));
+      const enumTypes = Object.values(schema5.enums).reduce(
+        (acc, cur) => {
+          acc.add(`${cur.schema}.${cur.name}`);
+          return acc;
+        },
+        /* @__PURE__ */ new Set()
+      );
       const imports = Object.values(schema5.tables).reduce(
         (res, it) => {
           const idxImports = Object.values(it.indexes).map((idx) => idx.isUnique ? "uniqueIndex" : "index");
@@ -75895,9 +75972,6 @@ var init_introspect_pg = __esm({
           res.pg.push(...fkImpots);
           res.pg.push(...pkImports);
           res.pg.push(...uniqueImports);
-          if (enumTypes.size > 0) {
-            res.pg.push("pgEnum");
-          }
           const columnImports = Object.values(it.columns).map((col) => {
             let patched = importsPatch2[col.type] || col.type;
             patched = patched.startsWith("varchar(") ? "varchar" : patched;
@@ -75916,6 +75990,13 @@ var init_introspect_pg = __esm({
         },
         { pg: [] }
       );
+      Object.values(schema5.enums).forEach((it) => {
+        if (it.schema && it.schema !== "public" && it.schema !== "") {
+          imports.pg.push("pgSchema");
+        } else if (it.schema === "public") {
+          imports.pg.push("pgEnum");
+        }
+      });
       const enumStatements = Object.values(schema5.enums).map((it) => {
         const enumSchema3 = schemas[it.schema];
         const paramName = paramNameFor(it.name, enumSchema3);
@@ -75944,10 +76025,7 @@ var init_introspect_pg = __esm({
           schema5.internal
         );
         statement += "}";
-        const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
-          return it.columnsFrom.length > 1 || isSelf3(it);
-        });
-        if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0 || Object.keys(table4.compositePrimaryKeys).length > 0 || Object.keys(table4.uniqueConstraints).length > 0) {
+        if (Object.keys(table4.indexes).length > 0 || Object.values(table4.foreignKeys).length > 0 || Object.keys(table4.compositePrimaryKeys).length > 0 || Object.keys(table4.uniqueConstraints).length > 0) {
           statement += ",\n";
           statement += "(table) => {\n";
           statement += "	return {\n";
@@ -75956,7 +76034,7 @@ var init_introspect_pg = __esm({
             Object.values(table4.indexes),
             casing2
           );
-          statement += createTableFKs3(Object.values(filteredFKs), schemas, casing2);
+          statement += createTableFKs3(Object.values(table4.foreignKeys), schemas, casing2);
           statement += createTablePKs3(
             Object.values(table4.compositePrimaryKeys),
             casing2
@@ -75998,9 +76076,18 @@ var init_introspect_pg = __esm({
     isSelf3 = (fk4) => {
       return fk4.tableFrom === fk4.tableTo;
     };
-    column6 = (tableName, type, name, enumTypes, casing2, defaultValue, internals) => {
-      var _a;
+    column6 = (tableName, type, name, enumTypes, typeSchema, casing2, defaultValue, internals) => {
+      var _a, _b, _c;
+      const isExpression = ((_b = (_a = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _a.columns[name]) == null ? void 0 : _b.isDefaultAnExpression) ?? false;
       const lowered = type.toLowerCase();
+      if (enumTypes.has(`${typeSchema}.${type}`)) {
+        let out = `${withCasing2(name, casing2)}: ${withCasing2(
+          paramNameFor(type, typeSchema),
+          casing2
+        )}("${name}")`;
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return out;
+      }
       if (lowered.startsWith("serial")) {
         return `${withCasing2(name, casing2)}: serial("${name}")`;
       }
@@ -76015,34 +76102,34 @@ var init_introspect_pg = __esm({
       }
       if (lowered.startsWith("integer")) {
         let out = `${withCasing2(name, casing2)}: integer("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
         let out = `${withCasing2(name, casing2)}: smallint("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("bigint")) {
         let out = `// You can use { mode: "bigint" } if numbers are exceeding js number limitations
 	`;
         out += `${withCasing2(name, casing2)}: bigint("${name}", { mode: "number" })`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("boolean")) {
         let out = `${withCasing2(name, casing2)}: boolean("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("double precision")) {
         let out = `${withCasing2(name, casing2)}: doublePrecision("${name}")`;
-        out += defaultValue ? `.default(${defaultValue})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("real")) {
         let out = `${withCasing2(name, casing2)}: real("${name}")`;
-        out += defaultValue ? `.default(${defaultValue})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("uuid")) {
@@ -76058,7 +76145,7 @@ var init_introspect_pg = __esm({
         }
         let out = params ? `${withCasing2(name, casing2)}: numeric("${name}", ${timeConfig2(params)})` : `${withCasing2(name, casing2)}: numeric("${name}")`;
         defaultValue = defaultValue ? defaultValue.startsWith(`'`) && defaultValue.endsWith(`'`) ? defaultValue.substring(1, defaultValue.length - 1) : defaultValue : void 0;
-        out += defaultValue ? `.default('${defaultValue}')` : "";
+        out += defaultValue ? `.default('${mapColumnDefault3(defaultValue, isExpression)}')` : "";
         return out;
       }
       if (lowered.startsWith("timestamp")) {
@@ -76073,7 +76160,7 @@ var init_introspect_pg = __esm({
           mode: "'string'"
         });
         let out = params ? `${withCasing2(name, casing2)}: timestamp("${name}", ${params})` : `${withCasing2(name, casing2)}: timestamp("${name}")`;
-        defaultValue = defaultValue === "now()" || defaultValue === "CURRENT_TIMESTAMP" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue === "CURRENT_TIMESTAMP" ? ".default(sql`CURRENT_TIMESTAMP`)" : defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
@@ -76085,14 +76172,14 @@ var init_introspect_pg = __esm({
         precision = precision ? precision : null;
         const params = timeConfig2({ precision, withTimezone });
         let out = params ? `${withCasing2(name, casing2)}: time("${name}", ${params})` : `${withCasing2(name, casing2)}: time("${name}")`;
-        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered.startsWith("interval")) {
         const params = intervalConfig(lowered);
         let out = params ? `${withCasing2(name, casing2)}: interval("${name}", ${params})` : `${withCasing2(name, casing2)}: interval("${name}")`;
-        out += defaultValue ? `.default(${defaultValue})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "date") {
@@ -76122,22 +76209,22 @@ var init_introspect_pg = __esm({
       }
       if (lowered.startsWith("inet")) {
         let out = `${withCasing2(name, casing2)}: inet("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("cidr")) {
         let out = `${withCasing2(name, casing2)}: cidr("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("macaddr")) {
         let out = `${withCasing2(name, casing2)}: macaddr("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("macaddr8")) {
         let out = `${withCasing2(name, casing2)}: macaddr8("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("varchar")) {
@@ -76154,17 +76241,17 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: varchar("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("point")) {
         let out = `${withCasing2(name, casing2)}: point("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("line")) {
         let out = `${withCasing2(name, casing2)}: point("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("geometry")) {
@@ -76182,7 +76269,7 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: geometry("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         if (isGeoUnknown) {
           let unknown2 = `// TODO: failed to parse geometry type because found more than 2 options inside geometry function '${type}'
 // Introspect is currently supporting only type and srid options
@@ -76206,7 +76293,7 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: vector("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("char")) {
@@ -76222,28 +76309,20 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: char("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
-      const columnInternals = (_a = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _a.columns[name];
+      const columnInternals = (_c = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _c.columns[name];
       if (typeof columnInternals !== "undefined") {
         if (columnInternals.isArray && columnInternals.rawType && enumTypes.has(columnInternals.rawType)) {
           let out = `${withCasing2(columnInternals.rawType, casing2)}: ${withCasing2(
             columnInternals.rawType,
             casing2
           )}("${name}")`;
-          out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+          out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
           return out;
         }
       }
-      if (enumTypes.has(type)) {
-        let out = `${withCasing2(name, casing2)}: ${withCasing2(
-          type,
-          casing2
-        )}("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
-        return out;
-      }
       let unknown = `// TODO: failed to parse database type '${type}'
 `;
       unknown += `	${withCasing2(name, casing2)}: unknown("${name}")`;
@@ -76276,6 +76355,7 @@ var init_introspect_pg = __esm({
           it.type,
           it.name,
           enumTypes,
+          it.typeSchema ?? "public",
           casing2,
           it.default,
           internals
@@ -76317,29 +76397,6 @@ var init_introspect_pg = __esm({
         }
         statement += it.identity ? generateIdentityParams(it.identity) : "";
         statement += it.generated ? `.generatedAlwaysAs(sql\`${it.generated.as}\`)` : "";
-        const fks2 = fkByColumnName[it.name];
-        if (fks2) {
-          const fksStatement = fks2.map((it2) => {
-            const onDelete = it2.onDelete && it2.onDelete !== "no action" ? it2.onDelete : null;
-            const onUpdate = it2.onUpdate && it2.onUpdate !== "no action" ? it2.onUpdate : null;
-            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(
-                paramName,
-                casing2
-              )}.${withCasing2(it2.columnsTo[0], casing2)}, ${paramsStr} )`;
-            }
-            return `.references(()${typeSuffix} => ${withCasing2(
-              paramName,
-              casing2
-            )}.${withCasing2(it2.columnsTo[0], casing2)})`;
-          }).join("");
-          statement += fksStatement;
-        }
         statement += ",\n";
       });
       return statement;
@@ -76363,7 +76420,7 @@ var init_introspect_pg = __esm({
           if (it2.isExpression) {
             return `sql\`${it2.expression}\``;
           } else {
-            return `table.${withCasing2(it2.expression, casing2)}${it2.opclass && vectorOps.includes(it2.opclass) ? `.op("${it2.opclass}")` : ""}`;
+            return `table.${withCasing2(it2.expression, casing2)}${it2.asc ? ".asc()" : ".desc()"}${it2.nulls === "first" ? ".nullsFirst()" : ".nullsLast()"}${it2.opclass && vectorOps.includes(it2.opclass) ? `.op("${it2.opclass}")` : ""}`;
           }
         }).join(", ")})`;
         statement += it.where ? `.where(sql\`${it.where}\`)` : "";
@@ -83402,7 +83459,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.24.0-6205f01";
+  const envVersion = "0.24.0-8d86512";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;