drizzle-kit 0.24.0-6386ea9 → 0.24.0-8d86512

package/api.d.mts

@@ -801,23 +801,28 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
                 isArray: zod.ZodOptional<zod.ZodBoolean>;
                 dimensions: zod.ZodOptional<zod.ZodNumber>;
                 rawType: zod.ZodOptional<zod.ZodString>;
+                isDefaultAnExpression: zod.ZodOptional<zod.ZodBoolean>;
             }, "strip", zod.ZodTypeAny, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
             }, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
             }>>>;
         }, "strip", zod.ZodTypeAny, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
             } | undefined>;
         }, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -826,6 +831,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }, "strip", zod.ZodTypeAny, {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -834,6 +840,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }, {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -936,6 +943,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     internal?: {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -1025,6 +1033,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     internal?: {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -1506,6 +1515,7 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
+                isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
         } | undefined>;
     } | undefined;

package/api.d.ts

@@ -801,23 +801,28 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
                 isArray: zod.ZodOptional<zod.ZodBoolean>;
                 dimensions: zod.ZodOptional<zod.ZodNumber>;
                 rawType: zod.ZodOptional<zod.ZodString>;
+                isDefaultAnExpression: zod.ZodOptional<zod.ZodBoolean>;
             }, "strip", zod.ZodTypeAny, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
             }, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
             }>>>;
         }, "strip", zod.ZodTypeAny, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
             } | undefined>;
         }, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -826,6 +831,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }, "strip", zod.ZodTypeAny, {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -834,6 +840,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     }, {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -936,6 +943,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     internal?: {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -1025,6 +1033,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
     internal?: {
         tables: Record<string, {
             columns: Record<string, {
+                isDefaultAnExpression?: boolean | undefined;
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
@@ -1506,6 +1515,7 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
                 isArray?: boolean | undefined;
                 dimensions?: number | undefined;
                 rawType?: string | undefined;
+                isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
         } | undefined>;
     } | undefined;

package/api.js

@@ -7464,11 +7464,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({
@@ -7715,7 +7734,8 @@ var init_pgSchema = __esm({
             objectType({
               isArray: booleanType().optional(),
               dimensions: numberType().optional(),
-              rawType: stringType().optional()
+              rawType: stringType().optional(),
+              isDefaultAnExpression: booleanType().optional()
             }).optional()
           )
         }).optional()
@@ -7853,7 +7873,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) => {
@@ -19373,7 +19393,7 @@ function jaccardDistance(column4, value) {
   }
   return sql`${column4} <%> ${value}`;
 }
-var init_vector = __esm({
+var init_vector2 = __esm({
   "../drizzle-orm/dist/sql/functions/vector.js"() {
     "use strict";
     init_sql();
@@ -19385,7 +19405,7 @@ var init_functions = __esm({
   "../drizzle-orm/dist/sql/functions/index.js"() {
     "use strict";
     init_aggregate();
-    init_vector();
+    init_vector2();
   }
 });
 
@@ -21049,7 +21069,7 @@ var init_sparsevec = __esm({
 
 // ../drizzle-orm/dist/pg-core/columns/vector_extension/vector.js
 var _a122, _b95, PgVectorBuilder, _a123, _b96, PgVector;
-var init_vector2 = __esm({
+var init_vector3 = __esm({
   "../drizzle-orm/dist/pg-core/columns/vector_extension/vector.js"() {
     "use strict";
     init_entity();
@@ -21121,7 +21141,7 @@ var init_columns = __esm({
     init_bit();
     init_halfvec();
     init_sparsevec();
-    init_vector2();
+    init_vector3();
   }
 });
 
@@ -24619,24 +24639,6 @@ var init_pg_core = __esm({
   }
 });
 
-// src/extensions/vector.ts
-var vectorOps;
-var init_vector3 = __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
 function stringFromIdentityProperty(field) {
   return typeof field === "string" ? field : typeof field === "undefined" ? void 0 : String(field);
@@ -24674,7 +24676,7 @@ function buildArrayString(array, sqlType) {
   }).join(",");
   return `{${values}}`;
 }
-var dialect4, indexName, generatePgSnapshot, trimChar, fromDatabase, columnToDefault, defaultForColumn;
+var dialect4, indexName, generatePgSnapshot, trimChar, fromDatabase, columnToDefault, columnEnumNameToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     "use strict";
@@ -24682,7 +24684,7 @@ var init_pgSerializer = __esm({
     init_dist();
     init_pg_core();
     init_pg_core();
-    init_vector3();
+    init_vector();
     init_outputs();
     init_utils();
     init_serializer();
@@ -25142,7 +25144,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,
@@ -25153,6 +25155,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
@@ -25172,30 +25175,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) {
@@ -25253,6 +25268,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";
@@ -25284,6 +25300,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(")) {
@@ -25329,7 +25364,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",
@@ -25503,11 +25538,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",
@@ -25521,6 +25556,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 = (column4) => {
       if (column4.column_default === null) {
         return void 0;
@@ -25529,19 +25570,33 @@ ${withStyle.errorWarning(
         return void 0;
       }
       const hasDifferentDefaultCast = Object.keys(columnToDefault).find((it) => column4.data_type.startsWith(it));
+      const hasDifferentDefaultCastForEnum = Object.keys(columnEnumNameToDefault).find(
+        (it) => column4.enum_name.startsWith(it)
+      );
       const columnDefaultAsString = column4.column_default.toString();
-      if (columnDefaultAsString.endsWith(
+      const endsWithEnumName = columnDefaultAsString.endsWith(
+        hasDifferentDefaultCastForEnum ? columnEnumNameToDefault[hasDifferentDefaultCastForEnum] : column4.data_type
+      );
+      const endsWithTypeName = columnDefaultAsString.endsWith(
         hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : column4.data_type
-      )) {
+      );
+      if (endsWithTypeName || endsWithEnumName) {
         const nonPrefixPart = column4.column_default.length - (hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column4.data_type}`).length - 1;
-        const rt = column4.column_default.toString().substring(1, nonPrefixPart);
+        let rt = column4.column_default.toString().substring(0, nonPrefixPart + 1);
         if (/^-?[\d.]+(?:e-?\d+)?$/.test(rt) && !column4.data_type.startsWith("numeric")) {
           return Number(rt);
         } else if (column4.data_type === "json" || column4.data_type === "jsonb") {
+          if (rt.startsWith("'")) {
+            rt = rt.slice(1, -1);
+          }
           const jsonWithoutSpaces = JSON.stringify(JSON.parse(rt));
           return `'${jsonWithoutSpaces}'${hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column4.data_type}`}`;
         } else if (column4.data_type === "boolean") {
           return column4.column_default === "true";
+        } else if (rt === "NULL") {
+          return `NULL`;
+        } else if (rt.startsWith("'") && rt.endsWith("'")) {
+          return rt;
         } else {
           return `'${rt}'`;
         }
@@ -25550,8 +25605,10 @@ ${withStyle.errorWarning(
           return Number(columnDefaultAsString);
         } else if (column4.data_type === "boolean") {
           return column4.column_default === "true";
+        } else if (columnDefaultAsString === "NULL") {
+          return `NULL`;
         } else {
-          return `${columnDefaultAsString}`;
+          return `${columnDefaultAsString.replace(/\\/g, "`\\")}`;
         }
       }
     };
@@ -33882,7 +33939,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();