drizzle-kit 0.27.1-e1194ce → 0.27.2-96d338b

package/bin.cjs

@@ -5813,30 +5813,11 @@ 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, roleSchema, sequenceSquashed, columnV7, column2, checkConstraint2, columnSquashed, tableV32, compositePK2, uniqueConstraint2, policy, policySquashed, viewWithOption, matViewWithOption, mergedViewWithOption, view2, 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({
@@ -6044,7 +6025,8 @@ var init_pgSchema = __esm({
       to: stringType().array().optional(),
       using: stringType().optional(),
       withCheck: stringType().optional(),
-      on: stringType().optional()
+      on: stringType().optional(),
+      schema: stringType().optional()
     }).strict();
     policySquashed = objectType({
       name: stringType(),
@@ -6295,7 +6277,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 && vectorOps.includes(c.opclass) ? c.opclass : ""}`
+          (c) => `${c.expression}--${c.isExpression}--${c.asc}--${c.nulls}--${c.opclass ? c.opclass : ""}`
         ).join(",,")};${idx.isUnique};${idx.concurrently};${idx.method};${idx.where};${JSON.stringify(idx.with)}`;
       },
       unsquashIdx: (input) => {
@@ -6361,12 +6343,12 @@ var init_pgSchema = __esm({
       squashFK: (fk4) => {
         return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""};${fk4.schemaTo || "public"}`;
       },
-      squashPolicy: (policy4) => {
+      squashPolicy: (policy3) => {
         var _a;
-        return `${policy4.name}--${policy4.as}--${policy4.for}--${(_a = policy4.to) == null ? void 0 : _a.join(",")}--${policy4.using}--${policy4.withCheck}--${policy4.on}`;
+        return `${policy3.name}--${policy3.as}--${policy3.for}--${(_a = policy3.to) == null ? void 0 : _a.join(",")}--${policy3.using}--${policy3.withCheck}--${policy3.on}`;
       },
-      unsquashPolicy: (policy4) => {
-        const splitted = policy4.split("--");
+      unsquashPolicy: (policy3) => {
+        const splitted = policy3.split("--");
         return {
           name: splitted[0],
           as: splitted[1],
@@ -6377,9 +6359,19 @@ var init_pgSchema = __esm({
           on: splitted[6] !== "undefined" ? splitted[6] : void 0
         };
       },
-      squashPolicyPush: (policy4) => {
+      squashPolicyPush: (policy3) => {
         var _a;
-        return `${policy4.name}--${policy4.as}--${policy4.for}--${(_a = policy4.to) == null ? void 0 : _a.join(",")}--${policy4.on}`;
+        return `${policy3.name}--${policy3.as}--${policy3.for}--${(_a = policy3.to) == null ? void 0 : _a.join(",")}--${policy3.on}`;
+      },
+      unsquashPolicyPush: (policy3) => {
+        const splitted = policy3.split("--");
+        return {
+          name: splitted[0],
+          as: splitted[1],
+          for: splitted[2],
+          to: splitted[3].split(","),
+          on: splitted[4] !== "undefined" ? splitted[4] : void 0
+        };
       },
       squashPK: (pk) => {
         return `${pk.columns.join(",")};${pk.name}`;
@@ -6493,8 +6485,8 @@ var init_pgSchema = __esm({
               return PgSquasher.squashUnique(unq);
             }
           );
-          const squashedPolicies = mapValues(it[1].policies, (policy4) => {
-            return action === "push" ? PgSquasher.squashPolicyPush(policy4) : PgSquasher.squashPolicy(policy4);
+          const squashedPolicies = mapValues(it[1].policies, (policy3) => {
+            return action === "push" ? PgSquasher.squashPolicyPush(policy3) : PgSquasher.squashPolicy(policy3);
           });
           const squashedChecksContraints = mapValues(
             it[1].checkConstraints,
@@ -6882,6 +6874,13 @@ function findAddedAndRemoved(columnNames1, columnNames2) {
   const removedColumns = columnNames1.filter((it) => !set2.has(it));
   return { addedColumns, removedColumns };
 }
+function escapeSingleQuotes(str) {
+  return str.replace(/'/g, "''");
+}
+function unescapeSingleQuotes(str, ignoreFirstAndLastChar) {
+  const regex = ignoreFirstAndLastChar ? /(?<!^)'(?!$)/g : /'/g;
+  return str.replace(/''/g, "'").replace(regex, "\\'");
+}
 var import_fs, import_path, import_url, copy, objectValues, assertV1OutFolder, dryJournal, prepareOutFolder, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey, normaliseSQLiteUrl, normalisePGliteUrl;
 var init_utils = __esm({
   "src/utils.ts"() {
@@ -11447,6 +11446,25 @@ var require_glob = __commonJS({
   }
 });
 
+// src/extensions/getTablesFilterByExtensions.ts
+var getTablesFilterByExtensions;
+var init_getTablesFilterByExtensions = __esm({
+  "src/extensions/getTablesFilterByExtensions.ts"() {
+    "use strict";
+    getTablesFilterByExtensions = ({
+      extensionsFilters,
+      dialect: dialect4
+    }) => {
+      if (extensionsFilters) {
+        if (extensionsFilters.includes("postgis") && dialect4 === "postgresql") {
+          return ["!geography_columns", "!geometry_columns", "!spatial_ref_sys"];
+        }
+      }
+      return [];
+    };
+  }
+});
+
 // src/schemaValidator.ts
 var dialects, dialect3, commonSquashedSchema, commonSchema;
 var init_schemaValidator = __esm({
@@ -11494,7 +11512,7 @@ var init_outputs = __esm({
           `Please specify a 'driver' param in config. It will help drizzle to know how to query you database. You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
         ),
         noDialect: () => withStyle.error(
-          `Please specify 'dialect' param in config, either of 'pg', 'mysql' or 'sqlite'`
+          `Please specify 'dialect' param in config, either of 'postgresql', 'mysql', 'sqlite' or 'turso'`
         )
       },
       common: {
@@ -17651,6 +17669,7 @@ var init_utils4 = __esm({
     import_hanji2 = __toESM(require_hanji());
     import_path2 = require("path");
     init_lib();
+    init_getTablesFilterByExtensions();
     init_global();
     init_schemaValidator();
     init_serializer();
@@ -17741,7 +17760,7 @@ var init_utils4 = __esm({
         name: options.name,
         custom: options.custom || false,
         prefix: prefix2,
-        breakpoints: breakpoints || true,
+        breakpoints: breakpoints ?? true,
         schema: schema5,
         out: out || "drizzle",
         bundle: driver2 === "expo",
@@ -17792,13 +17811,7 @@ var init_utils4 = __esm({
       const tablesFilter = tablesFilterConfig ? typeof tablesFilterConfig === "string" ? [tablesFilterConfig] : tablesFilterConfig : [];
       const schemasFilterConfig = config.schemaFilter;
       const schemasFilter = schemasFilterConfig ? typeof schemasFilterConfig === "string" ? [schemasFilterConfig] : schemasFilterConfig : [];
-      if (config.extensionsFilters) {
-        if (config.extensionsFilters.includes("postgis") && config.dialect === "postgresql") {
-          tablesFilter.push(
-            ...["!geography_columns", "!geometry_columns", "!spatial_ref_sys"]
-          );
-        }
-      }
+      tablesFilter.push(...getTablesFilterByExtensions(config));
       if (config.dialect === "postgresql") {
         const parsed2 = postgresCredentials.safeParse(config);
         if (!parsed2.success) {
@@ -18255,15 +18268,15 @@ function clearDefaults(defaultValue, collate) {
   if (defaultValue.startsWith(collate)) {
     resultDefault = resultDefault.substring(collate.length, defaultValue.length).replace(/\\/g, "");
     if (resultDefault.startsWith("'") && resultDefault.endsWith("'")) {
-      return `('${resultDefault.substring(1, resultDefault.length - 1)}')`;
+      return `('${escapeSingleQuotes(resultDefault.substring(1, resultDefault.length - 1))}')`;
     } else {
-      return `'${resultDefault}'`;
+      return `'${escapeSingleQuotes(resultDefault.substring(1, resultDefault.length - 1))}'`;
     }
   } else {
     return `(${resultDefault})`;
   }
 }
-var import_drizzle_orm2, import_mysql_core2, indexName, generateMySqlSnapshot, fromDatabase;
+var import_drizzle_orm2, import_mysql_core2, indexName, handleEnumType, generateMySqlSnapshot, fromDatabase;
 var init_mysqlSerializer = __esm({
   "src/serializer/mysqlSerializer.ts"() {
     "use strict";
@@ -18271,10 +18284,17 @@ var init_mysqlSerializer = __esm({
     import_drizzle_orm2 = require("drizzle-orm");
     import_mysql_core2 = require("drizzle-orm/mysql-core");
     init_outputs();
+    init_utils();
     init_utils5();
     indexName = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
     };
+    handleEnumType = (type) => {
+      let str = type.split("(")[1];
+      str = str.substring(0, str.length - 1);
+      const values = str.split(",").map((v) => `'${escapeSingleQuotes(v.substring(1, v.length - 1))}'`);
+      return `enum(${values.join(",")})`;
+    };
     generateMySqlSnapshot = (tables, views, casing2) => {
       const dialect4 = new import_mysql_core2.MySqlDialect({ casing: casing2 });
       const result = {};
@@ -18301,12 +18321,13 @@ var init_mysqlSerializer = __esm({
         columns.forEach((column7) => {
           const name = getColumnCasing(column7, casing2);
           const notNull = column7.notNull;
-          const sqlTypeLowered = column7.getSQLType().toLowerCase();
+          const sqlType = column7.getSQLType();
+          const sqlTypeLowered = sqlType.toLowerCase();
           const autoIncrement = typeof column7.autoIncrement === "undefined" ? false : column7.autoIncrement;
           const generated = column7.generated;
           const columnToSet = {
             name,
-            type: column7.getSQLType(),
+            type: sqlType.startsWith("enum") ? handleEnumType(sqlType) : sqlType,
             primaryKey: false,
             // If field is autoincrement it's notNull by default
             // notNull: autoIncrement ? true : notNull,
@@ -18353,7 +18374,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
               columnToSet.default = sqlToStr(column7.default, casing2);
             } else {
               if (typeof column7.default === "string") {
-                columnToSet.default = `'${column7.default}'`;
+                columnToSet.default = `'${escapeSingleQuotes(column7.default)}'`;
               } else {
                 if (sqlTypeLowered === "json") {
                   columnToSet.default = `'${JSON.stringify(column7.default)}'`;
@@ -18724,15 +18745,15 @@ ${withStyle.errorWarning(
             changedType = columnType.replace("bigint unsigned", "serial");
           }
         }
-        if (columnType.startsWith("tinyint")) {
-          changedType = "tinyint";
+        if (columnType.includes("decimal(10,0)")) {
+          changedType = columnType.replace("decimal(10,0)", "decimal");
         }
         let onUpdate = void 0;
         if (columnType.startsWith("timestamp") && typeof columnExtra !== "undefined" && columnExtra.includes("on update CURRENT_TIMESTAMP")) {
           onUpdate = true;
         }
         const newColumn = {
-          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !["decimal", "char", "varchar"].some((type) => columnType.startsWith(type)) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
+          default: columnDefault === null || columnDefault === void 0 ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) && !["decimal", "char", "varchar"].some((type) => columnType.startsWith(type)) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${escapeSingleQuotes(columnDefault)}'`,
           autoincrement: isAutoincrement,
           name: columnName,
           type: changedType,
@@ -19081,6 +19102,24 @@ 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, {
@@ -19272,7 +19311,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
               columnToSet.default = sqlToStr(column7.default, casing2);
             } else {
               if (typeof column7.default === "string") {
-                columnToSet.default = `'${column7.default}'`;
+                columnToSet.default = `'${escapeSingleQuotes(column7.default)}'`;
               } else {
                 if (sqlTypeLowered === "jsonb" || sqlTypeLowered === "json") {
                   columnToSet.default = `'${JSON.stringify(column7.default)}'::${sqlTypeLowered}`;
@@ -19455,18 +19494,18 @@ ${withStyle.errorWarning(
             with: value.config.with ?? {}
           };
         });
-        policies2.forEach((policy4) => {
+        policies2.forEach((policy3) => {
           var _a2, _b2;
           const mappedTo = [];
-          if (!policy4.to) {
+          if (!policy3.to) {
             mappedTo.push("public");
           } else {
-            if (policy4.to && typeof policy4.to === "string") {
-              mappedTo.push(policy4.to);
-            } else if (policy4.to && (0, import_drizzle_orm4.is)(policy4.to, import_pg_core2.PgRole)) {
-              mappedTo.push(policy4.to.name);
-            } else if (policy4.to && Array.isArray(policy4.to)) {
-              policy4.to.forEach((it) => {
+            if (policy3.to && typeof policy3.to === "string") {
+              mappedTo.push(policy3.to);
+            } else if (policy3.to && (0, import_drizzle_orm4.is)(policy3.to, import_pg_core2.PgRole)) {
+              mappedTo.push(policy3.to.name);
+            } else if (policy3.to && Array.isArray(policy3.to)) {
+              policy3.to.forEach((it) => {
                 if (typeof it === "string") {
                   mappedTo.push(it);
                 } else if ((0, import_drizzle_orm4.is)(it, import_pg_core2.PgRole)) {
@@ -19475,24 +19514,24 @@ ${withStyle.errorWarning(
               });
             }
           }
-          if (policiesObject[policy4.name] !== void 0) {
+          if (policiesObject[policy3.name] !== void 0) {
             console.log(
               `
 ${withStyle.errorWarning(
                 `We've found duplicated policy name across ${source_default.underline.blue(tableKey2)} table. Please rename one of the policies with ${source_default.underline.blue(
-                  policy4.name
+                  policy3.name
                 )} name`
               )}`
             );
             process.exit(1);
           }
-          policiesObject[policy4.name] = {
-            name: policy4.name,
-            as: ((_a2 = policy4.as) == null ? void 0 : _a2.toUpperCase()) ?? "PERMISSIVE",
-            for: ((_b2 = policy4.for) == null ? void 0 : _b2.toUpperCase()) ?? "ALL",
+          policiesObject[policy3.name] = {
+            name: policy3.name,
+            as: ((_a2 = policy3.as) == null ? void 0 : _a2.toUpperCase()) ?? "PERMISSIVE",
+            for: ((_b2 = policy3.for) == null ? void 0 : _b2.toUpperCase()) ?? "ALL",
             to: mappedTo.sort(),
-            using: (0, import_drizzle_orm4.is)(policy4.using, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy4.using).sql : void 0,
-            withCheck: (0, import_drizzle_orm4.is)(policy4.withCheck, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy4.withCheck).sql : void 0
+            using: (0, import_drizzle_orm4.is)(policy3.using, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy3.using).sql : void 0,
+            withCheck: (0, import_drizzle_orm4.is)(policy3.withCheck, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy3.withCheck).sql : void 0
           };
         });
         checks.forEach((check2) => {
@@ -19536,28 +19575,28 @@ ${withStyle.errorWarning(
           isRLSEnabled: enableRLS
         };
       }
-      for (const policy4 of policies) {
-        if (!policy4._linkedTable) {
+      for (const policy3 of policies) {
+        if (!policy3._linkedTable) {
           console.log(
             `
 ${withStyle.errorWarning(
-              `"Policy ${policy4.name} was skipped because it was not linked to any table. You should either include the policy in a table or use .link() on the policy to link it to any table you have. For more information, please check:`
+              `"Policy ${policy3.name} was skipped because it was not linked to any table. You should either include the policy in a table or use .link() on the policy to link it to any table you have. For more information, please check:`
             )}`
           );
           continue;
         }
-        const tableConfig = (0, import_pg_core2.getTableConfig)(policy4._linkedTable);
+        const tableConfig = (0, import_pg_core2.getTableConfig)(policy3._linkedTable);
         const tableKey2 = `${tableConfig.schema ?? "public"}.${tableConfig.name}`;
         const mappedTo = [];
-        if (!policy4.to) {
+        if (!policy3.to) {
           mappedTo.push("public");
         } else {
-          if (policy4.to && typeof policy4.to === "string") {
-            mappedTo.push(policy4.to);
-          } else if (policy4.to && (0, import_drizzle_orm4.is)(policy4.to, import_pg_core2.PgRole)) {
-            mappedTo.push(policy4.to.name);
-          } else if (policy4.to && Array.isArray(policy4.to)) {
-            policy4.to.forEach((it) => {
+          if (policy3.to && typeof policy3.to === "string") {
+            mappedTo.push(policy3.to);
+          } else if (policy3.to && (0, import_drizzle_orm4.is)(policy3.to, import_pg_core2.PgRole)) {
+            mappedTo.push(policy3.to.name);
+          } else if (policy3.to && Array.isArray(policy3.to)) {
+            policy3.to.forEach((it) => {
               if (typeof it === "string") {
                 mappedTo.push(it);
               } else if ((0, import_drizzle_orm4.is)(it, import_pg_core2.PgRole)) {
@@ -19566,30 +19605,31 @@ ${withStyle.errorWarning(
             });
           }
         }
-        if (((_a = result[tableKey2]) == null ? void 0 : _a.policies[policy4.name]) !== void 0 || policiesToReturn[policy4.name] !== void 0) {
+        if (((_a = result[tableKey2]) == null ? void 0 : _a.policies[policy3.name]) !== void 0 || policiesToReturn[policy3.name] !== void 0) {
           console.log(
             `
 ${withStyle.errorWarning(
               `We've found duplicated policy name across ${source_default.underline.blue(tableKey2)} table. Please rename one of the policies with ${source_default.underline.blue(
-                policy4.name
+                policy3.name
               )} name`
             )}`
           );
           process.exit(1);
         }
         const mappedPolicy = {
-          name: policy4.name,
-          as: ((_b = policy4.as) == null ? void 0 : _b.toUpperCase()) ?? "PERMISSIVE",
-          for: ((_c = policy4.for) == null ? void 0 : _c.toUpperCase()) ?? "ALL",
+          name: policy3.name,
+          as: ((_b = policy3.as) == null ? void 0 : _b.toUpperCase()) ?? "PERMISSIVE",
+          for: ((_c = policy3.for) == null ? void 0 : _c.toUpperCase()) ?? "ALL",
           to: mappedTo.sort(),
-          using: (0, import_drizzle_orm4.is)(policy4.using, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy4.using).sql : void 0,
-          withCheck: (0, import_drizzle_orm4.is)(policy4.withCheck, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy4.withCheck).sql : void 0
+          using: (0, import_drizzle_orm4.is)(policy3.using, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy3.using).sql : void 0,
+          withCheck: (0, import_drizzle_orm4.is)(policy3.withCheck, import_drizzle_orm4.SQL) ? dialect4.sqlToQuery(policy3.withCheck).sql : void 0
         };
         if (result[tableKey2]) {
-          result[tableKey2].policies[policy4.name] = mappedPolicy;
+          result[tableKey2].policies[policy3.name] = mappedPolicy;
         } else {
-          policiesToReturn[policy4.name] = {
+          policiesToReturn[policy3.name] = {
             ...mappedPolicy,
+            schema: tableConfig.schema ?? "public",
             on: `"${tableConfig.schema ?? "public"}"."${tableConfig.name}"`
           };
         }
@@ -19800,9 +19840,10 @@ ${withStyle.errorWarning(
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, entities, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, entities, progressCallback, tsSchema) => {
       const result = {};
       const views = {};
+      const policies = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t2) => `n.nspname = '${t2}'`).join(" or ");
       const allTables = await db.query(
@@ -19932,7 +19973,8 @@ WHERE
           }
         }
       }
-      const wherePolicies = schemaFilters.map((t2) => `schemaname = '${t2}'`).join(" or ");
+      const schemasForLinkedPoliciesInSchema = Object.values((tsSchema == null ? void 0 : tsSchema.policies) ?? {}).map((it) => it.schema);
+      const wherePolicies = [...schemaFilters, ...schemasForLinkedPoliciesInSchema].map((t2) => `schemaname = '${t2}'`).join(" or ");
       const policiesByTable = {};
       const allPolicies = await db.query(`SELECT schemaname, tablename, policyname as name, permissive as "as", roles as to, cmd as for, qual as using, with_check as "withCheck" FROM pg_policies${wherePolicies === "" ? "" : ` WHERE ${wherePolicies}`};`);
       for (const dbPolicy of allPolicies) {
@@ -19948,6 +19990,15 @@ WHERE
             [dbPolicy.name]: { ...rest, to: parsedTo, withCheck: parsedWithCheck, using: parsedUsing }
           };
         }
+        if (tsSchema == null ? void 0 : tsSchema.policies[dbPolicy.name]) {
+          policies[dbPolicy.name] = {
+            ...rest,
+            to: parsedTo,
+            withCheck: parsedWithCheck,
+            using: parsedUsing,
+            on: tsSchema == null ? void 0 : tsSchema.policies[dbPolicy.name].on
+          };
+        }
       }
       if (progressCallback) {
         progressCallback(
@@ -20545,7 +20596,7 @@ WHERE
         schemas: schemasObject,
         sequences: sequencesToReturn,
         roles: rolesToReturn,
-        policies: {},
+        policies,
         views,
         _meta: {
           schemas: {},
@@ -20559,10 +20610,7 @@ WHERE
       var _a, _b;
       const columnName = column7.column_name;
       const isArray3 = ((_b = (_a = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _a.columns[columnName]) == null ? void 0 : _b.isArray) ?? false;
-      if (column7.column_default === null) {
-        return void 0;
-      }
-      if (column7.data_type === "serial" || column7.data_type === "smallserial" || column7.data_type === "bigserial") {
+      if (column7.column_default === null || column7.column_default === void 0 || column7.data_type === "serial" || column7.data_type === "smallserial" || column7.data_type === "bigserial") {
         return void 0;
       }
       if (column7.column_default.endsWith("[]")) {
@@ -20816,6 +20864,7 @@ var init_sqliteSerializer = __esm({
     import_drizzle_orm6 = require("drizzle-orm");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
     init_outputs();
+    init_utils();
     init_utils5();
     generateSqliteSnapshot = (tables, views, casing2) => {
       const dialect4 = new import_sqlite_core2.SQLiteSyncDialect({ casing: casing2 });
@@ -20859,7 +20908,7 @@ var init_sqliteSerializer = __esm({
             if ((0, import_drizzle_orm6.is)(column7.default, import_drizzle_orm6.SQL)) {
               columnToSet.default = sqlToStr(column7.default, casing2);
             } else {
-              columnToSet.default = typeof column7.default === "string" ? `'${column7.default}'` : typeof column7.default === "object" || Array.isArray(column7.default) ? `'${JSON.stringify(column7.default)}'` : column7.default;
+              columnToSet.default = typeof column7.default === "string" ? `'${escapeSingleQuotes(column7.default)}'` : typeof column7.default === "object" || Array.isArray(column7.default) ? `'${JSON.stringify(column7.default)}'` : column7.default;
             }
           }
           columnsObject[name] = columnToSet;
@@ -21488,7 +21537,7 @@ ${filenames.join("\n")}
 });
 
 // src/migrationPreparator.ts
-var import_crypto, import_fs4, prepareMySqlDbPushSnapshot, prepareSQLiteDbPushSnapshot, preparePgDbPushSnapshot, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, fillPgSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
+var import_crypto, import_fs4, prepareMySqlDbPushSnapshot, prepareSQLiteDbPushSnapshot, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, fillPgSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
 var init_migrationPreparator = __esm({
   "src/migrationPreparator.ts"() {
     "use strict";
@@ -21520,14 +21569,6 @@ var init_migrationPreparator = __esm({
       };
       return { prev, cur: result };
     };
-    preparePgDbPushSnapshot = async (prev, schemaPath, casing2, schemaFilter = ["public"]) => {
-      const serialized = await serializePg(schemaPath, casing2, schemaFilter);
-      const id = (0, import_crypto.randomUUID)();
-      const idPrev = prev.id;
-      const { version: version3, dialect: dialect4, ...rest } = serialized;
-      const result = { version: version3, dialect: dialect4, id, prevId: idPrev, ...rest };
-      return { prev, cur: result };
-    };
     prepareMySqlMigrationSnapshot = async (migrationFolders, schemaPath, casing2) => {
       const prevSnapshot = mysqlSchema.parse(
         preparePrevSnapshot(migrationFolders, dryMySql)
@@ -24601,7 +24642,7 @@ function fromJson(statements, dialect4, action, json2) {
   }).filter((it) => it !== "");
   return result;
 }
-var pgNativeTypes, isPgNativeType, Convertor, PgCreateRoleConvertor, PgDropRoleConvertor, PgRenameRoleConvertor, PgAlterRoleConvertor, PgCreatePolicyConvertor, PgDropPolicyConvertor, PgRenamePolicyConvertor, PgAlterPolicyConvertor, PgCreateIndPolicyConvertor, PgDropIndPolicyConvertor, PgRenameIndPolicyConvertor, PgAlterIndPolicyConvertor, PgEnableRlsConvertor, PgDisableRlsConvertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, PgCreateViewConvertor, MySqlCreateViewConvertor, SqliteCreateViewConvertor, PgDropViewConvertor, MySqlDropViewConvertor, SqliteDropViewConvertor, MySqlAlterViewConvertor, PgRenameViewConvertor, MySqlRenameViewConvertor, PgAlterViewSchemaConvertor, PgAlterViewAddWithOptionConvertor, PgAlterViewDropWithOptionConvertor, PgAlterViewAlterTablespaceConvertor, PgAlterViewAlterUsingConvertor, PgAlterTableAlterColumnSetGenerated, PgAlterTableAlterColumnDropGenerated, PgAlterTableAlterColumnAlterGenerated, PgAlterTableAddUniqueConstraintConvertor, PgAlterTableDropUniqueConstraintConvertor, PgAlterTableAddCheckConstraintConvertor, PgAlterTableDeleteCheckConstraintConvertor, MySQLAlterTableAddUniqueConstraintConvertor, MySQLAlterTableDropUniqueConstraintConvertor, MySqlAlterTableAddCheckConstraintConvertor, MySqlAlterTableDeleteCheckConstraintConvertor, CreatePgSequenceConvertor, DropPgSequenceConvertor, RenamePgSequenceConvertor, MovePgSequenceConvertor, AlterPgSequenceConvertor, CreateTypeEnumConvertor, DropTypeEnumConvertor, AlterTypeAddValueConvertor, AlterTypeSetSchemaConvertor, AlterRenameTypeConvertor, AlterTypeDropValueConvertor, PgDropTableConvertor, MySQLDropTableConvertor, SQLiteDropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, PgAlterTableAlterColumnDropGeneratedConvertor, PgAlterTableAlterColumnSetExpressionConvertor, PgAlterTableAlterColumnAlterrGeneratedConvertor, SqliteAlterTableAlterColumnDropGeneratedConvertor, SqliteAlterTableAlterColumnSetExpressionConvertor, SqliteAlterTableAlterColumnAlterGeneratedConvertor, MySqlAlterTableAlterColumnAlterrGeneratedConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, LibSQLModifyColumn, MySqlModifyColumn, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, LibSQLCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MySqlDropIndexConvertor, SQLiteRecreateTableConvertor, LibSQLRecreateTableConvertor, convertors;
+var parseType, Convertor, PgCreateRoleConvertor, PgDropRoleConvertor, PgRenameRoleConvertor, PgAlterRoleConvertor, PgCreatePolicyConvertor, PgDropPolicyConvertor, PgRenamePolicyConvertor, PgAlterPolicyConvertor, PgCreateIndPolicyConvertor, PgDropIndPolicyConvertor, PgRenameIndPolicyConvertor, PgAlterIndPolicyConvertor, PgEnableRlsConvertor, PgDisableRlsConvertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, PgCreateViewConvertor, MySqlCreateViewConvertor, SqliteCreateViewConvertor, PgDropViewConvertor, MySqlDropViewConvertor, SqliteDropViewConvertor, MySqlAlterViewConvertor, PgRenameViewConvertor, MySqlRenameViewConvertor, PgAlterViewSchemaConvertor, PgAlterViewAddWithOptionConvertor, PgAlterViewDropWithOptionConvertor, PgAlterViewAlterTablespaceConvertor, PgAlterViewAlterUsingConvertor, PgAlterTableAlterColumnSetGenerated, PgAlterTableAlterColumnDropGenerated, PgAlterTableAlterColumnAlterGenerated, PgAlterTableAddUniqueConstraintConvertor, PgAlterTableDropUniqueConstraintConvertor, PgAlterTableAddCheckConstraintConvertor, PgAlterTableDeleteCheckConstraintConvertor, MySQLAlterTableAddUniqueConstraintConvertor, MySQLAlterTableDropUniqueConstraintConvertor, MySqlAlterTableAddCheckConstraintConvertor, MySqlAlterTableDeleteCheckConstraintConvertor, CreatePgSequenceConvertor, DropPgSequenceConvertor, RenamePgSequenceConvertor, MovePgSequenceConvertor, AlterPgSequenceConvertor, CreateTypeEnumConvertor, DropTypeEnumConvertor, AlterTypeAddValueConvertor, AlterTypeSetSchemaConvertor, AlterRenameTypeConvertor, AlterTypeDropValueConvertor, PgDropTableConvertor, MySQLDropTableConvertor, SQLiteDropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, PgAlterTableAlterColumnDropGeneratedConvertor, PgAlterTableAlterColumnSetExpressionConvertor, PgAlterTableAlterColumnAlterrGeneratedConvertor, SqliteAlterTableAlterColumnDropGeneratedConvertor, SqliteAlterTableAlterColumnSetExpressionConvertor, SqliteAlterTableAlterColumnAlterGeneratedConvertor, MySqlAlterTableAlterColumnAlterrGeneratedConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, LibSQLModifyColumn, MySqlModifyColumn, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, LibSQLCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MySqlDropIndexConvertor, SQLiteRecreateTableConvertor, LibSQLRecreateTableConvertor, convertors;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
     "use strict";
@@ -24609,52 +24650,56 @@ var init_sqlgenerator = __esm({
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
-    pgNativeTypes = /* @__PURE__ */ new Set([
-      "uuid",
-      "smallint",
-      "integer",
-      "bigint",
-      "boolean",
-      "text",
-      "varchar",
-      "serial",
-      "bigserial",
-      "decimal",
-      "numeric",
-      "real",
-      "json",
-      "jsonb",
-      "time",
-      "time with time zone",
-      "time without time zone",
-      "time",
-      "timestamp",
-      "timestamp with time zone",
-      "timestamp without time zone",
-      "date",
-      "interval",
-      "bigint",
-      "bigserial",
-      "double precision",
-      "interval year",
-      "interval month",
-      "interval day",
-      "interval hour",
-      "interval minute",
-      "interval second",
-      "interval year to month",
-      "interval day to hour",
-      "interval day to minute",
-      "interval day to second",
-      "interval hour to minute",
-      "interval hour to second",
-      "interval minute to second"
-    ]);
-    isPgNativeType = (it) => {
-      if (pgNativeTypes.has(it))
-        return true;
-      const toCheck = it.replace(/ /g, "");
-      return toCheck.startsWith("varchar(") || toCheck.startsWith("char(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(") || toCheck.startsWith("doubleprecision[") || toCheck.startsWith("intervalyear(") || toCheck.startsWith("intervalmonth(") || toCheck.startsWith("intervalday(") || toCheck.startsWith("intervalhour(") || toCheck.startsWith("intervalminute(") || toCheck.startsWith("intervalsecond(") || toCheck.startsWith("intervalyeartomonth(") || toCheck.startsWith("intervaldaytohour(") || toCheck.startsWith("intervaldaytominute(") || toCheck.startsWith("intervaldaytosecond(") || toCheck.startsWith("intervalhourtominute(") || toCheck.startsWith("intervalhourtosecond(") || toCheck.startsWith("intervalminutetosecond(") || toCheck.startsWith("vector(") || toCheck.startsWith("geometry(") || /^(\w+)(\[\d*])+$/.test(it);
+    init_utils();
+    parseType = (schemaPrefix, type) => {
+      const pgNativeTypes = [
+        "uuid",
+        "smallint",
+        "integer",
+        "bigint",
+        "boolean",
+        "text",
+        "varchar",
+        "serial",
+        "bigserial",
+        "decimal",
+        "numeric",
+        "real",
+        "json",
+        "jsonb",
+        "time",
+        "time with time zone",
+        "time without time zone",
+        "time",
+        "timestamp",
+        "timestamp with time zone",
+        "timestamp without time zone",
+        "date",
+        "interval",
+        "bigint",
+        "bigserial",
+        "double precision",
+        "interval year",
+        "interval month",
+        "interval day",
+        "interval hour",
+        "interval minute",
+        "interval second",
+        "interval year to month",
+        "interval day to hour",
+        "interval day to minute",
+        "interval day to second",
+        "interval hour to minute",
+        "interval hour to second",
+        "interval minute to second",
+        "char",
+        "vector",
+        "geometry"
+      ];
+      const arrayDefinitionRegex = /\[\d*(?:\[\d*\])*\]/g;
+      const arrayDefinition = (type.match(arrayDefinitionRegex) ?? []).join("");
+      const withoutArrayDefinition = type.replace(arrayDefinitionRegex, "");
+      return pgNativeTypes.some((it) => type.startsWith(it)) ? `${withoutArrayDefinition}${arrayDefinition}` : `${schemaPrefix}"${withoutArrayDefinition}"${arrayDefinition}`;
     };
     Convertor = class {
     };
@@ -24696,14 +24741,14 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         var _a, _b, _c;
-        const policy4 = statement.data;
+        const policy3 = statement.data;
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
-        const usingPart = policy4.using ? ` USING (${policy4.using})` : "";
-        const withCheckPart = policy4.withCheck ? ` WITH CHECK (${policy4.withCheck})` : "";
-        const policyToPart = (_a = policy4.to) == null ? void 0 : _a.map(
+        const usingPart = policy3.using ? ` USING (${policy3.using})` : "";
+        const withCheckPart = policy3.withCheck ? ` WITH CHECK (${policy3.withCheck})` : "";
+        const policyToPart = (_a = policy3.to) == null ? void 0 : _a.map(
           (v) => ["current_user", "current_role", "session_user", "public"].includes(v) ? v : `"${v}"`
         ).join(", ");
-        return `CREATE POLICY "${policy4.name}" ON ${tableNameWithSchema} AS ${(_b = policy4.as) == null ? void 0 : _b.toUpperCase()} FOR ${(_c = policy4.for) == null ? void 0 : _c.toUpperCase()} TO ${policyToPart}${usingPart}${withCheckPart};`;
+        return `CREATE POLICY "${policy3.name}" ON ${tableNameWithSchema} AS ${(_b = policy3.as) == null ? void 0 : _b.toUpperCase()} FOR ${(_c = policy3.for) == null ? void 0 : _c.toUpperCase()} TO ${policyToPart}${usingPart}${withCheckPart};`;
       }
     };
     PgDropPolicyConvertor = class extends Convertor {
@@ -24711,9 +24756,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "drop_policy" && dialect4 === "postgresql";
       }
       convert(statement) {
-        const policy4 = statement.data;
+        const policy3 = statement.data;
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
-        return `DROP POLICY "${policy4.name}" ON ${tableNameWithSchema} CASCADE;`;
+        return `DROP POLICY "${policy3.name}" ON ${tableNameWithSchema} CASCADE;`;
       }
     };
     PgRenamePolicyConvertor = class extends Convertor {
@@ -24729,9 +24774,9 @@ var init_sqlgenerator = __esm({
       can(statement, dialect4) {
         return statement.type === "alter_policy" && dialect4 === "postgresql";
       }
-      convert(statement) {
-        const newPolicy = PgSquasher.unsquashPolicy(statement.newData);
-        const oldPolicy = PgSquasher.unsquashPolicy(statement.oldData);
+      convert(statement, _dialect, action) {
+        const newPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(statement.newData) : PgSquasher.unsquashPolicy(statement.newData);
+        const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(statement.oldData) : PgSquasher.unsquashPolicy(statement.oldData);
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
         const usingPart = newPolicy.using ? ` USING (${newPolicy.using})` : oldPolicy.using ? ` USING (${oldPolicy.using})` : "";
         const withCheckPart = newPolicy.withCheck ? ` WITH CHECK (${newPolicy.withCheck})` : oldPolicy.withCheck ? ` WITH CHECK  (${oldPolicy.withCheck})` : "";
@@ -24744,13 +24789,13 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         var _a, _b, _c;
-        const policy4 = statement.data;
-        const usingPart = policy4.using ? ` USING (${policy4.using})` : "";
-        const withCheckPart = policy4.withCheck ? ` WITH CHECK (${policy4.withCheck})` : "";
-        const policyToPart = (_a = policy4.to) == null ? void 0 : _a.map(
+        const policy3 = statement.data;
+        const usingPart = policy3.using ? ` USING (${policy3.using})` : "";
+        const withCheckPart = policy3.withCheck ? ` WITH CHECK (${policy3.withCheck})` : "";
+        const policyToPart = (_a = policy3.to) == null ? void 0 : _a.map(
           (v) => ["current_user", "current_role", "session_user", "public"].includes(v) ? v : `"${v}"`
         ).join(", ");
-        return `CREATE POLICY "${policy4.name}" ON ${policy4.on} AS ${(_b = policy4.as) == null ? void 0 : _b.toUpperCase()} FOR ${(_c = policy4.for) == null ? void 0 : _c.toUpperCase()} TO ${policyToPart}${usingPart}${withCheckPart};`;
+        return `CREATE POLICY "${policy3.name}" ON ${policy3.on} AS ${(_b = policy3.as) == null ? void 0 : _b.toUpperCase()} FOR ${(_c = policy3.for) == null ? void 0 : _c.toUpperCase()} TO ${policyToPart}${usingPart}${withCheckPart};`;
       }
     };
     PgDropIndPolicyConvertor = class extends Convertor {
@@ -24758,8 +24803,8 @@ var init_sqlgenerator = __esm({
         return statement.type === "drop_ind_policy" && dialect4 === "postgresql";
       }
       convert(statement) {
-        const policy4 = statement.data;
-        return `DROP POLICY "${policy4.name}" ON ${policy4.on} CASCADE;`;
+        const policy3 = statement.data;
+        return `DROP POLICY "${policy3.name}" ON ${policy3.on} CASCADE;`;
       }
     };
     PgRenameIndPolicyConvertor = class extends Convertor {
@@ -24817,7 +24862,7 @@ var init_sqlgenerator = __esm({
           const defaultStatement = column7.default !== void 0 ? ` DEFAULT ${column7.default}` : "";
           const uniqueConstraint4 = column7.isUnique ? ` CONSTRAINT "${column7.uniqueName}" UNIQUE${column7.nullsNotDistinct ? " NULLS NOT DISTINCT" : ""}` : "";
           const schemaPrefix = column7.typeSchema && column7.typeSchema !== "public" ? `"${column7.typeSchema}".` : "";
-          const type = isPgNativeType(column7.type) ? column7.type : `${schemaPrefix}"${column7.type}"`;
+          const type = parseType(schemaPrefix, column7.type);
           const generated = column7.generated;
           const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated == null ? void 0 : generated.as}) STORED` : "";
           const unsquashedIdentity = column7.identity ? PgSquasher.unsquashIdentity(column7.identity) : void 0;
@@ -25380,7 +25425,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
         const { name, values, schema: schema5 } = st;
         const enumNameWithSchema = schema5 ? `"${schema5}"."${name}"` : `"${name}"`;
         let valuesStatement = "(";
-        valuesStatement += values.map((it) => `'${it}'`).join(", ");
+        valuesStatement += values.map((it) => `'${escapeSingleQuotes(it)}'`).join(", ");
         valuesStatement += ")";
         let statement = `CREATE TYPE ${enumNameWithSchema} AS ENUM${valuesStatement};`;
         return statement;
@@ -25458,7 +25503,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
       can(statement, dialect4) {
         return statement.type === "drop_table" && dialect4 === "postgresql";
       }
-      convert(statement) {
+      convert(statement, _d, action) {
         const { tableName, schema: schema5, policies } = statement;
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const dropPolicyConvertor = new PgDropPolicyConvertor();
@@ -25466,7 +25511,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
           return dropPolicyConvertor.convert({
             type: "drop_policy",
             tableName,
-            data: PgSquasher.unsquashPolicy(p2),
+            data: action === "push" ? PgSquasher.unsquashPolicyPush(p2) : PgSquasher.unsquashPolicy(p2),
             schema: schema5
           });
         })) ?? [];
@@ -25590,7 +25635,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column7.default !== void 0 ? ` DEFAULT ${column7.default}` : ""}`;
         const schemaPrefix = column7.typeSchema && column7.typeSchema !== "public" ? `"${column7.typeSchema}".` : "";
-        const fixedType = isPgNativeType(column7.type) ? column7.type : `${schemaPrefix}"${column7.type}"`;
+        const fixedType = parseType(schemaPrefix, column7.type);
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
         const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
         const identityWithSchema = schema5 ? `"${schema5}"."${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"` : `"${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"`;
@@ -26161,8 +26206,9 @@ WITH ${withCheckOption} CHECK OPTION` : "";
           statement.new
         );
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
-        return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT ${statement.oldConstraintName};
-${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${newColumns.join(",")});`;
+        console.log(statement.oldConstraintName, statement.newConstraintName);
+        return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${statement.oldConstraintName}";
+${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newConstraintName}" PRIMARY KEY("${newColumns.join('","')}");`;
       }
     };
     MySqlAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
@@ -28374,30 +28420,29 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    prepareAddCompositePrimaryKeyPg = (tableName, schema5, pks, json2) => {
+    prepareAddCompositePrimaryKeyPg = (tableName, schema5, pks) => {
       return Object.values(pks).map((it) => {
-        const unsquashed = PgSquasher.unsquashPK(it);
         return {
           type: "create_composite_pk",
           tableName,
           data: it,
           schema: schema5,
-          constraintName: json2.tables[`${schema5 || "public"}.${tableName}`].compositePrimaryKeys[unsquashed.name].name
+          constraintName: PgSquasher.unsquashPK(it).name
         };
       });
     };
-    prepareDeleteCompositePrimaryKeyPg = (tableName, schema5, pks, json1) => {
+    prepareDeleteCompositePrimaryKeyPg = (tableName, schema5, pks) => {
       return Object.values(pks).map((it) => {
         return {
           type: "delete_composite_pk",
           tableName,
           data: it,
           schema: schema5,
-          constraintName: json1.tables[`${schema5 || "public"}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it).name].name
+          constraintName: PgSquasher.unsquashPK(it).name
         };
       });
     };
-    prepareAlterCompositePrimaryKeyPg = (tableName, schema5, pks, json1, json2) => {
+    prepareAlterCompositePrimaryKeyPg = (tableName, schema5, pks) => {
       return Object.values(pks).map((it) => {
         return {
           type: "alter_composite_pk",
@@ -28405,8 +28450,8 @@ var init_jsonStatements = __esm({
           old: it.__old,
           new: it.__new,
           schema: schema5,
-          oldConstraintName: json1.tables[`${schema5 || "public"}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it.__old).name].name,
-          newConstraintName: json2.tables[`${schema5 || "public"}.${tableName}`].compositePrimaryKeys[PgSquasher.unsquashPK(it.__new).name].name
+          oldConstraintName: PgSquasher.unsquashPK(it.__old).name,
+          newConstraintName: PgSquasher.unsquashPK(it.__new).name
         };
       });
     };
@@ -28462,18 +28507,19 @@ var init_jsonStatements = __esm({
           type: "create_composite_pk",
           tableName,
           data: it,
-          constraintName: json2.tables[tableName].compositePrimaryKeys[unsquashed.name].name
+          constraintName: unsquashed.name
         });
       }
       return res;
     };
     prepareDeleteCompositePrimaryKeyMySql = (tableName, pks, json1) => {
       return Object.values(pks).map((it) => {
+        const unsquashed = MySqlSquasher.unsquashPK(it);
         return {
           type: "delete_composite_pk",
           tableName,
           data: it,
-          constraintName: json1.tables[tableName].compositePrimaryKeys[MySqlSquasher.unsquashPK(it).name].name
+          constraintName: unsquashed.name
         };
       });
     };
@@ -29434,8 +29480,10 @@ var init_snapshotsDiffer = __esm({
         const { renamed, created: created2, deleted: deleted2 } = await policyResolver2({
           tableName: entry.name,
           schema: entry.schema,
-          deleted: entry.policies.deleted.map(PgSquasher.unsquashPolicy),
-          created: entry.policies.added.map(PgSquasher.unsquashPolicy)
+          deleted: entry.policies.deleted.map(
+            action === "push" ? PgSquasher.unsquashPolicyPush : PgSquasher.unsquashPolicy
+          ),
+          created: entry.policies.added.map(action === "push" ? PgSquasher.unsquashPolicyPush : PgSquasher.unsquashPolicy)
         });
         if (created2.length > 0) {
           policyCreates.push({
@@ -29472,12 +29520,12 @@ var init_snapshotsDiffer = __esm({
         (tableKey2, tableValue) => {
           const patchedPolicies = mapKeys(
             tableValue.policies,
-            (policyKey, policy4) => {
+            (policyKey, policy3) => {
               const rens = policyRenamesDict[`${tableValue.schema || "public"}.${tableValue.name}`] || [];
               const newName = columnChangeFor(policyKey, rens);
-              const unsquashedPolicy = PgSquasher.unsquashPolicy(policy4);
+              const unsquashedPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(policy3) : PgSquasher.unsquashPolicy(policy3);
               unsquashedPolicy.name = newName;
-              policy4 = PgSquasher.squashPolicy(unsquashedPolicy);
+              policy3 = PgSquasher.squashPolicy(unsquashedPolicy);
               return newName;
             }
           );
@@ -29489,8 +29537,12 @@ var init_snapshotsDiffer = __esm({
       const indPolicyCreates = [];
       const indPolicyDeletes = [];
       const { renamed: indPolicyRenames, created, deleted } = await indPolicyResolver2({
-        deleted: indPolicyRes.deleted.map((t2) => PgSquasher.unsquashPolicy(t2.values)),
-        created: indPolicyRes.added.map((t2) => PgSquasher.unsquashPolicy(t2.values))
+        deleted: indPolicyRes.deleted.map(
+          (t2) => action === "push" ? PgSquasher.unsquashPolicyPush(t2.values) : PgSquasher.unsquashPolicy(t2.values)
+        ),
+        created: indPolicyRes.added.map(
+          (t2) => action === "push" ? PgSquasher.unsquashPolicyPush(t2.values) : PgSquasher.unsquashPolicy(t2.values)
+        )
       });
       if (created.length > 0) {
         indPolicyCreates.push({
@@ -29614,17 +29666,17 @@ var init_snapshotsDiffer = __esm({
       const jsonDeletedCheckConstraints = [];
       const jsonCreatedCheckConstraints = [];
       for (let it of alteredTables) {
-        let addedColumns = [];
+        let addedColumns;
         for (const addedPkName of Object.keys(it.addedCompositePKs)) {
           const addedPkColumns = it.addedCompositePKs[addedPkName];
-          addedColumns = SQLiteSquasher.unsquashPK(addedPkColumns);
+          addedColumns = PgSquasher.unsquashPK(addedPkColumns);
         }
-        let deletedColumns = [];
+        let deletedColumns;
         for (const deletedPkName of Object.keys(it.deletedCompositePKs)) {
           const deletedPkColumns = it.deletedCompositePKs[deletedPkName];
-          deletedColumns = SQLiteSquasher.unsquashPK(deletedPkColumns);
+          deletedColumns = PgSquasher.unsquashPK(deletedPkColumns);
         }
-        const doPerformDeleteAndCreate = JSON.stringify(addedColumns) !== JSON.stringify(deletedColumns);
+        const doPerformDeleteAndCreate = JSON.stringify(addedColumns ?? {}) !== JSON.stringify(deletedColumns ?? {});
         let addedCompositePKs = [];
         let deletedCompositePKs = [];
         let alteredCompositePKs = [];
@@ -29632,22 +29684,18 @@ var init_snapshotsDiffer = __esm({
           addedCompositePKs = prepareAddCompositePrimaryKeyPg(
             it.name,
             it.schema,
-            it.addedCompositePKs,
-            curFull
+            it.addedCompositePKs
           );
           deletedCompositePKs = prepareDeleteCompositePrimaryKeyPg(
             it.name,
             it.schema,
-            it.deletedCompositePKs,
-            prevFull
+            it.deletedCompositePKs
           );
         }
         alteredCompositePKs = prepareAlterCompositePrimaryKeyPg(
           it.name,
           it.schema,
-          it.alteredCompositePKs,
-          prevFull,
-          curFull
+          it.alteredCompositePKs
         );
         let addedUniqueConstraints = [];
         let deletedUniqueConstraints = [];
@@ -29766,9 +29814,9 @@ var init_snapshotsDiffer = __esm({
         );
       }
       typedResult.alteredPolicies.forEach(({ values }) => {
-        const policy4 = PgSquasher.unsquashPolicy(values);
-        const newPolicy = PgSquasher.unsquashPolicy(json2.policies[policy4.name].values);
-        const oldPolicy = PgSquasher.unsquashPolicy(json1.policies[policy4.name].values);
+        const policy3 = action === "push" ? PgSquasher.unsquashPolicyPush(values) : PgSquasher.unsquashPolicy(values);
+        const newPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(json2.policies[policy3.name].values) : PgSquasher.unsquashPolicy(json2.policies[policy3.name].values);
+        const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(json2.policies[policy3.name].values) : PgSquasher.unsquashPolicy(json1.policies[policy3.name].values);
         if (newPolicy.as !== oldPolicy.as) {
           jsonDropIndPoliciesStatements.push(
             ...prepareDropIndPolicyJsons(
@@ -29827,8 +29875,8 @@ var init_snapshotsDiffer = __esm({
       }
       alteredTables.forEach((it) => {
         Object.keys(it.alteredPolicies).forEach((policyName) => {
-          const newPolicy = PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__new);
-          const oldPolicy = PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__old);
+          const newPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(it.alteredPolicies[policyName].__new) : PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__new);
+          const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(it.alteredPolicies[policyName].__old) : PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__old);
           if (newPolicy.as !== oldPolicy.as) {
             jsonDropPoliciesStatements.push(
               ...prepareDropPolicyJsons(
@@ -29882,7 +29930,8 @@ var init_snapshotsDiffer = __esm({
           if (policiesInPreviousState.length > 0 && policiesInCurrentState.length === 0 && !table4.isRLSEnabled) {
             jsonDisableRLSStatements.push({ type: "disable_rls", tableName: table4.name, schema: table4.schema });
           }
-          if (table4.isRLSEnabled !== tableInPreviousState.isRLSEnabled) {
+          const wasRlsEnabled = tableInPreviousState ? tableInPreviousState.isRLSEnabled : false;
+          if (table4.isRLSEnabled !== wasRlsEnabled) {
             if (table4.isRLSEnabled) {
               jsonEnableRLSStatements.push({ type: "enable_rls", tableName: table4.name, schema: table4.schema });
             } else if (!table4.isRLSEnabled && policiesInCurrentState.length === 0) {
@@ -30009,7 +30058,11 @@ var init_snapshotsDiffer = __esm({
       });
       jsonCreatePoliciesStatements.push(...[].concat(
         ...createdTables.map(
-          (it) => prepareCreatePolicyJsons(it.name, it.schema, Object.values(it.policies).map(PgSquasher.unsquashPolicy))
+          (it) => prepareCreatePolicyJsons(
+            it.name,
+            it.schema,
+            Object.values(it.policies).map(action === "push" ? PgSquasher.unsquashPolicyPush : PgSquasher.unsquashPolicy)
+          )
         )
       ));
       const createViews = [];
@@ -30224,7 +30277,7 @@ var init_snapshotsDiffer = __esm({
         }
         return true;
       });
-      const sqlStatements = fromJson(filteredEnumsJsonStatements, "postgresql");
+      const sqlStatements = fromJson(filteredEnumsJsonStatements, "postgresql", action);
       const uniqueSqlStatements = [];
       sqlStatements.forEach((ss) => {
         if (!uniqueSqlStatements.includes(ss)) {
@@ -30641,9 +30694,9 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDeletedCompositePKs);
       jsonStatements.push(...jsonTableAlternations);
       jsonStatements.push(...jsonAddedCompositePKs);
+      jsonStatements.push(...jsonAddColumnsStatemets);
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonDeletedUniqueConstraints);
-      jsonStatements.push(...jsonAddColumnsStatemets);
       jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
       jsonStatements.push(...jsonCreatedCheckConstraints);
@@ -33050,13 +33103,7 @@ var init_migrate = __esm({
         console.error(e2);
       }
     };
-    preparePgPush = async (schemaPath, snapshot, schemaFilter, casing2) => {
-      const { prev, cur } = await preparePgDbPushSnapshot(
-        snapshot,
-        schemaPath,
-        casing2,
-        schemaFilter
-      );
+    preparePgPush = async (cur, prev) => {
       const validatedPrev = pgSchema.parse(prev);
       const validatedCur = pgSchema.parse(cur);
       const squashedPrev = squashPgScheme(validatedPrev, "push");
@@ -53660,7 +53707,7 @@ function determineRequestsReferrer(request, { referrerURLCallback, referrerOrigi
   if (request.referrer === "no-referrer" || request.referrerPolicy === "") {
     return null;
   }
-  const policy4 = request.referrerPolicy;
+  const policy3 = request.referrerPolicy;
   if (request.referrer === "about:client") {
     return "no-referrer";
   }
@@ -53677,7 +53724,7 @@ function determineRequestsReferrer(request, { referrerURLCallback, referrerOrigi
     referrerOrigin = referrerOriginCallback(referrerOrigin);
   }
   const currentURL = new URL(request.url);
-  switch (policy4) {
+  switch (policy3) {
     case "no-referrer":
       return "no-referrer";
     case "origin":
@@ -53713,18 +53760,18 @@ function determineRequestsReferrer(request, { referrerURLCallback, referrerOrigi
       }
       return referrerURL;
     default:
-      throw new TypeError(`Invalid referrerPolicy: ${policy4}`);
+      throw new TypeError(`Invalid referrerPolicy: ${policy3}`);
   }
 }
 function parseReferrerPolicyFromHeader(headers) {
   const policyTokens = (headers.get("referrer-policy") || "").split(/[,\s]+/);
-  let policy4 = "";
+  let policy3 = "";
   for (const token of policyTokens) {
     if (token && ReferrerPolicy.has(token)) {
-      policy4 = token;
+      policy3 = token;
     }
   }
-  return policy4;
+  return policy3;
 }
 var import_node_net, ReferrerPolicy, DEFAULT_REFERRER_POLICY;
 var init_referrer = __esm({
@@ -69693,7 +69740,7 @@ var require_dist_cjs42 = __commonJS({
     var import_util_buffer_from = require_dist_cjs23();
     var import_util_utf8 = require_dist_cjs24();
     var import_buffer2 = require("buffer");
-    var import_crypto9 = require("crypto");
+    var import_crypto10 = require("crypto");
     var _Hash = class _Hash {
       constructor(algorithmIdentifier, secret) {
         this.algorithmIdentifier = algorithmIdentifier;
@@ -69707,7 +69754,7 @@ var require_dist_cjs42 = __commonJS({
         return Promise.resolve(this.hash.digest());
       }
       reset() {
-        this.hash = this.secret ? (0, import_crypto9.createHmac)(this.algorithmIdentifier, castSourceData(this.secret)) : (0, import_crypto9.createHash)(this.algorithmIdentifier);
+        this.hash = this.secret ? (0, import_crypto10.createHmac)(this.algorithmIdentifier, castSourceData(this.secret)) : (0, import_crypto10.createHash)(this.algorithmIdentifier);
       }
     };
     __name(_Hash, "Hash");
@@ -74371,7 +74418,7 @@ var require_fromWebToken = __commonJS({
     var fromWebToken2 = (init2) => async () => {
       var _a;
       (_a = init2.logger) == null ? void 0 : _a.debug("@aws-sdk/credential-provider-web-identity", "fromWebToken");
-      const { roleArn, roleSessionName, webIdentityToken, providerId, policyArns, policy: policy4, durationSeconds } = init2;
+      const { roleArn, roleSessionName, webIdentityToken, providerId, policyArns, policy: policy3, durationSeconds } = init2;
       let { roleAssumerWithWebIdentity } = init2;
       if (!roleAssumerWithWebIdentity) {
         const { getDefaultRoleAssumerWithWebIdentity } = await Promise.resolve().then(() => __importStar2(require_dist_cjs50()));
@@ -74387,7 +74434,7 @@ var require_fromWebToken = __commonJS({
         WebIdentityToken: webIdentityToken,
         ProviderId: providerId,
         PolicyArns: policyArns,
-        Policy: policy4,
+        Policy: policy3,
         DurationSeconds: durationSeconds
       });
     };
@@ -77515,7 +77562,7 @@ var init_pgPushUtils = __esm({
             }
           }
         }
-        const stmnt = fromJson([statement], "postgresql");
+        const stmnt = fromJson([statement], "postgresql", "push");
         if (typeof stmnt !== "undefined") {
           statementsToExecute.push(...stmnt);
         }
@@ -78669,7 +78716,7 @@ var init_pgIntrospect = __esm({
     init_global();
     init_pgSerializer();
     init_views();
-    pgPushIntrospect = async (db, filters, schemaFilters, entities) => {
+    pgPushIntrospect = async (db, filters, schemaFilters, entities, tsSchema) => {
       const matchers = filters.map((it) => {
         return new Minimatch(it);
       });
@@ -78698,7 +78745,7 @@ var init_pgIntrospect = __esm({
       );
       const res = await (0, import_hanji9.renderWithTask)(
         progress,
-        fromDatabase2(db, filter2, schemaFilters, entities)
+        fromDatabase2(db, filter2, schemaFilters, entities, void 0, tsSchema)
       );
       const schema5 = { id: originUUID, prevId: "", ...res };
       const { internal, ...schemaWithoutInternals } = schema5;
@@ -78915,8 +78962,8 @@ var init_introspect_sqlite = __esm({
       if (defaultValue === "NULL") {
         return `sql\`NULL\``;
       }
-      if (typeof defaultValue === "string" && defaultValue.startsWith("'") && defaultValue.endsWith("'")) {
-        return defaultValue.substring(1, defaultValue.length - 1);
+      if (typeof defaultValue === "string") {
+        return defaultValue.substring(1, defaultValue.length - 1).replaceAll('"', '\\"').replaceAll("''", "'");
       }
       return defaultValue;
     };
@@ -79174,12 +79221,14 @@ __export(push_exports, {
   pgPush: () => pgPush,
   sqlitePush: () => sqlitePush
 });
-var import_hanji11, mysqlPush, pgPush, sqlitePush, libSQLPush;
+var import_crypto6, import_hanji11, mysqlPush, pgPush, sqlitePush, libSQLPush;
 var init_push = __esm({
   "src/cli/commands/push.ts"() {
     "use strict";
     init_source();
+    import_crypto6 = require("crypto");
     import_hanji11 = __toESM(require_hanji());
+    init_serializer();
     init_sqlgenerator();
     init_selector_ui();
     init_outputs();
@@ -79292,9 +79341,13 @@ var init_push = __esm({
       const { preparePostgresDB: preparePostgresDB2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
       const { pgPushIntrospect: pgPushIntrospect2 } = await Promise.resolve().then(() => (init_pgIntrospect(), pgIntrospect_exports));
       const db = await preparePostgresDB2(credentials2);
-      const { schema: schema5 } = await pgPushIntrospect2(db, tablesFilter, schemasFilter, entities);
+      const serialized = await serializePg(schemaPath, casing2, schemasFilter);
+      const { schema: schema5 } = await pgPushIntrospect2(db, tablesFilter, schemasFilter, entities, serialized);
       const { preparePgPush: preparePgPush2 } = await Promise.resolve().then(() => (init_migrate(), migrate_exports));
-      const statements = await preparePgPush2(schemaPath, schema5, schemasFilter, casing2);
+      const statements = await preparePgPush2(
+        { id: (0, import_crypto6.randomUUID)(), prevId: schema5.id, ...serialized },
+        schema5
+      );
       try {
         if (statements.sqlStatements.length === 0) {
           (0, import_hanji11.render)(`[${source_default.blue("i")}] No changes detected`);
@@ -79435,15 +79488,15 @@ var init_push = __esm({
 [${source_default.blue("i")}] No changes detected`);
         } else {
           if (!("driver" in credentials2)) {
-            await db.query("begin");
+            await db.run("begin");
             try {
               for (const dStmnt of statementsToExecute) {
-                await db.query(dStmnt);
+                await db.run(dStmnt);
               }
-              await db.query("commit");
+              await db.run("commit");
             } catch (e2) {
               console.error(e2);
-              await db.query("rollback");
+              await db.run("rollback");
               process.exit(1);
             }
           }
@@ -79895,6 +79948,7 @@ var init_introspect_mysql = __esm({
     init_utils3();
     init_global();
     init_mysqlSerializer();
+    init_utils();
     mysqlImportsList = /* @__PURE__ */ new Set([
       "mysqlTable",
       "mysqlEnum",
@@ -80022,6 +80076,12 @@ var init_introspect_mysql = __esm({
             patched = patched.startsWith("varbinary(") ? "varbinary" : patched;
             patched = patched.startsWith("int(") ? "int" : patched;
             patched = patched.startsWith("double(") ? "double" : patched;
+            patched = patched.startsWith("float(") ? "float" : patched;
+            patched = patched.startsWith("int unsigned") ? "int" : patched;
+            patched = patched.startsWith("tinyint unsigned") ? "tinyint" : patched;
+            patched = patched.startsWith("smallint unsigned") ? "smallint" : patched;
+            patched = patched.startsWith("mediumint unsigned") ? "mediumint" : patched;
+            patched = patched.startsWith("bigint unsigned") ? "bigint" : patched;
             return patched;
           }).filter((type) => {
             return mysqlImportsList.has(type);
@@ -80045,6 +80105,12 @@ var init_introspect_mysql = __esm({
           patched = patched.startsWith("varbinary(") ? "varbinary" : patched;
           patched = patched.startsWith("int(") ? "int" : patched;
           patched = patched.startsWith("double(") ? "double" : patched;
+          patched = patched.startsWith("float(") ? "float" : patched;
+          patched = patched.startsWith("int unsigned") ? "int" : patched;
+          patched = patched.startsWith("tinyint unsigned") ? "tinyint" : patched;
+          patched = patched.startsWith("smallint unsigned") ? "smallint" : patched;
+          patched = patched.startsWith("mediumint unsigned") ? "mediumint" : patched;
+          patched = patched.startsWith("bigint unsigned") ? "bigint" : patched;
           return patched;
         }).filter((type) => {
           return mysqlImportsList.has(type);
@@ -80191,28 +80257,32 @@ import { sql } from "drizzle-orm"
       }
       if (lowered.startsWith("int")) {
         const isUnsigned = lowered.startsWith("int unsigned");
-        let out = `${casing2(name)}: int(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? "{ unsigned: true }" : ""})`;
+        const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
+        let out = `${casing2(name)}: int(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("tinyint")) {
         const isUnsigned = lowered.startsWith("tinyint unsigned");
-        let out = `${casing2(name)}: tinyint(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? ", { unsigned: true }" : ""})`;
+        const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
+        let out = `${casing2(name)}: tinyint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
         const isUnsigned = lowered.startsWith("smallint unsigned");
-        let out = `${casing2(name)}: smallint(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? ", { unsigned: true }" : ""})`;
+        const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
+        let out = `${casing2(name)}: smallint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("mediumint")) {
         const isUnsigned = lowered.startsWith("mediumint unsigned");
-        let out = `${casing2(name)}: mediumint(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? ", { unsigned: true }" : ""})`;
+        const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
+        let out = `${casing2(name)}: mediumint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
@@ -80231,17 +80301,28 @@ import { sql } from "drizzle-orm"
       }
       if (lowered.startsWith("double")) {
         let params;
-        if (lowered.length > 6) {
-          const [precision, scale] = lowered.slice(7, lowered.length - 1).split(",");
+        if (lowered.length > (lowered.includes("unsigned") ? 15 : 6)) {
+          const [precision, scale] = lowered.slice(7, lowered.length - (1 + (lowered.includes("unsigned") ? 9 : 0))).split(",");
           params = { precision, scale };
         }
+        if (lowered.includes("unsigned")) {
+          params = { ...params ?? {}, unsigned: true };
+        }
         const timeConfigParams = params ? timeConfig(params) : void 0;
         let out = params ? `${casing2(name)}: double(${dbColumnName2({ name, casing: rawCasing, withMode: timeConfigParams !== void 0 })}${timeConfig(params)})` : `${casing2(name)}: double(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
-      if (lowered === "float") {
-        let out = `${casing2(name)}: float(${dbColumnName2({ name, casing: rawCasing })})`;
+      if (lowered.startsWith("float")) {
+        let params;
+        if (lowered.length > (lowered.includes("unsigned") ? 14 : 5)) {
+          const [precision, scale] = lowered.slice(6, lowered.length - (1 + (lowered.includes("unsigned") ? 9 : 0))).split(",");
+          params = { precision, scale };
+        }
+        if (lowered.includes("unsigned")) {
+          params = { ...params ?? {}, unsigned: true };
+        }
+        let out = `${casing2(name)}: float(${dbColumnName2({ name, casing: rawCasing })}${params ? timeConfig(params) : ""})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -80318,7 +80399,8 @@ import { sql } from "drizzle-orm"
           "varchar".length + 1,
           lowered.length - 1
         )} })`;
-        out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
+        const mappedDefaultValue = mapColumnDefault2(defaultValue, isExpression);
+        out += defaultValue ? `.default(${isExpression ? mappedDefaultValue : unescapeSingleQuotes(mappedDefaultValue, true)})` : "";
         return out;
       }
       if (lowered.startsWith("char")) {
@@ -80347,10 +80429,13 @@ import { sql } from "drizzle-orm"
       }
       if (lowered.startsWith("decimal")) {
         let params;
-        if (lowered.length > 7) {
-          const [precision, scale] = lowered.slice(8, lowered.length - 1).split(",");
+        if (lowered.length > (lowered.includes("unsigned") ? 16 : 7)) {
+          const [precision, scale] = lowered.slice(8, lowered.length - (1 + (lowered.includes("unsigned") ? 9 : 0))).split(",");
           params = { precision, scale };
         }
+        if (lowered.includes("unsigned")) {
+          params = { ...params ?? {}, unsigned: true };
+        }
         const timeConfigParams = params ? timeConfig(params) : void 0;
         let out = params ? `${casing2(name)}: decimal(${dbColumnName2({ name, casing: rawCasing, withMode: timeConfigParams !== void 0 })}${timeConfigParams})` : `${casing2(name)}: decimal(${dbColumnName2({ name, casing: rawCasing })})`;
         defaultValue = typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
@@ -80368,9 +80453,10 @@ import { sql } from "drizzle-orm"
         return out;
       }
       if (lowered.startsWith("enum")) {
-        const values = lowered.substring("enum".length + 1, lowered.length - 1);
+        const values = lowered.substring("enum".length + 1, lowered.length - 1).split(",").map((v) => unescapeSingleQuotes(v, true)).join(",");
         let out = `${casing2(name)}: mysqlEnum(${dbColumnName2({ name, casing: rawCasing, withMode: true })}[${values}])`;
-        out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
+        const mappedDefaultValue = mapColumnDefault2(defaultValue, isExpression);
+        out += defaultValue ? `.default(${isExpression ? mappedDefaultValue : unescapeSingleQuotes(mappedDefaultValue, true)})` : "";
         return out;
       }
       if (lowered.startsWith("varbinary")) {
@@ -80557,9 +80643,9 @@ var init_introspect_pg = __esm({
     import_relations = require("drizzle-orm/relations");
     init_utils3();
     import_casing4 = require("drizzle-orm/casing");
-    init_vector();
     init_global();
     init_pgSerializer();
+    init_utils();
     pgImportsList = /* @__PURE__ */ new Set([
       "pgTable",
       "pgEnum",
@@ -80799,7 +80885,7 @@ var init_introspect_pg = __esm({
         const enumSchema3 = schemas[it.schema];
         const paramName = paramNameFor(it.name, enumSchema3);
         const func = enumSchema3 ? `${enumSchema3}.enum` : "pgEnum";
-        const values = Object.values(it.values).map((it2) => `'${it2}'`).join(", ");
+        const values = Object.values(it.values).map((it2) => `'${unescapeSingleQuotes(it2, false)}'`).join(", ");
         return `export const ${withCasing2(paramName, casing2)} = ${func}("${it.name}", [${values}])
 `;
       }).join("").concat("\n");
@@ -80961,7 +81047,7 @@ import { sql } from "drizzle-orm"
         return typeof defaultValue !== "undefined" ? `.default(${buildArrayDefault(defaultValue, lowered)})` : "";
       }
       if (enumTypes.has(`${typeSchema}.${type.replace("[]", "")}`)) {
-        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(unescapeSingleQuotes(defaultValue, true), isExpression)})` : "";
       }
       if (lowered.startsWith("integer")) {
         return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
@@ -80989,19 +81075,19 @@ import { sql } from "drizzle-orm"
         return defaultValue ? `.default('${mapColumnDefault3(defaultValue, isExpression)}')` : "";
       }
       if (lowered.startsWith("timestamp")) {
-        return defaultValue === "now()" ? ".defaultNow()" : defaultValue === "CURRENT_TIMESTAMP" ? ".default(sql`CURRENT_TIMESTAMP`)" : defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return defaultValue === "now()" ? ".defaultNow()" : /^'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(\.\d+)?([+-]\d{2}(:\d{2})?)?'$/.test(defaultValue) ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : defaultValue ? `.default(sql\`${defaultValue}\`)` : "";
       }
       if (lowered.startsWith("time")) {
-        return defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return defaultValue === "now()" ? ".defaultNow()" : /^'\d{2}:\d{2}(:\d{2})?(\.\d+)?'$/.test(defaultValue) ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : defaultValue ? `.default(sql\`${defaultValue}\`)` : "";
       }
       if (lowered.startsWith("interval")) {
         return defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
       }
       if (lowered === "date") {
-        return defaultValue === "now()" ? ".defaultNow()" : defaultValue === "CURRENT_DATE" ? `.default(sql\`${defaultValue}\`)` : defaultValue ? `.default(${defaultValue})` : "";
+        return defaultValue === "now()" ? ".defaultNow()" : /^'\d{4}-\d{2}-\d{2}'$/.test(defaultValue) ? `.default(${defaultValue})` : defaultValue ? `.default(sql\`${defaultValue}\`)` : "";
       }
       if (lowered.startsWith("text")) {
-        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(unescapeSingleQuotes(defaultValue, true), isExpression)})` : "";
       }
       if (lowered.startsWith("jsonb")) {
         const def = typeof defaultValue !== "undefined" ? defaultValue.replace(/::(.*?)(?<![^\w"])(?=$)/, "").slice(1, -1) : null;
@@ -81024,7 +81110,7 @@ import { sql } from "drizzle-orm"
         return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
       }
       if (lowered.startsWith("varchar")) {
-        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(unescapeSingleQuotes(defaultValue, true), isExpression)})` : "";
       }
       if (lowered.startsWith("point")) {
         return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
@@ -81039,7 +81125,7 @@ import { sql } from "drizzle-orm"
         return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
       }
       if (lowered.startsWith("char")) {
-        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(unescapeSingleQuotes(defaultValue, true), isExpression)})` : "";
       }
       return "";
     };
@@ -81285,7 +81371,7 @@ import { sql } from "drizzle-orm"
           if (it2.isExpression) {
             return `sql\`${it2.expression}\``;
           } else {
-            return `table.${withCasing2(it2.expression, casing2)}${it2.asc ? ".asc()" : ".desc()"}${it2.nulls === "first" ? ".nullsFirst()" : ".nullsLast()"}${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 ? `.op("${it2.opclass}")` : ""}`;
           }
         }).join(", ")})`;
         statement += it.where ? `.where(sql\`${it.where}\`)` : "";
@@ -81921,13 +82007,13 @@ function getInternalBody(response) {
   const state = response[stateKey];
   return state && state.body || void 0;
 }
-var import_http, import_http2, import_stream2, import_crypto6, RequestError, toRequestError, GlobalRequest, Request3, newRequestFromIncoming, getRequestCache, requestCache, incomingKey, urlKey, abortControllerKey, getAbortController, requestPrototype, newRequest, buildOutgoingHttpHeaders, responseCache, getResponseCache, cacheKey, GlobalResponse, Response22, stateKey, X_ALREADY_SENT, webFetch, regBuffer, regContentType, handleRequestError, handleFetchError, handleResponseError, responseViaCache, responseViaResponseObject, getRequestListener, createAdaptorServer, serve;
+var import_http, import_http2, import_stream2, import_crypto7, RequestError, toRequestError, GlobalRequest, Request3, newRequestFromIncoming, getRequestCache, requestCache, incomingKey, urlKey, abortControllerKey, getAbortController, requestPrototype, newRequest, buildOutgoingHttpHeaders, responseCache, getResponseCache, cacheKey, GlobalResponse, Response22, stateKey, X_ALREADY_SENT, webFetch, regBuffer, regContentType, handleRequestError, handleFetchError, handleResponseError, responseViaCache, responseViaResponseObject, getRequestListener, createAdaptorServer, serve;
 var init_dist2 = __esm({
   "../node_modules/.pnpm/@hono+node-server@1.12.0/node_modules/@hono/node-server/dist/index.mjs"() {
     import_http = require("http");
     import_http2 = require("http2");
     import_stream2 = require("stream");
-    import_crypto6 = __toESM(require("crypto"), 1);
+    import_crypto7 = __toESM(require("crypto"), 1);
     RequestError = class extends Error {
       static name = "RequestError";
       constructor(message, options) {
@@ -82143,7 +82229,7 @@ var init_dist2 = __esm({
     X_ALREADY_SENT = "x-hono-already-sent";
     webFetch = global.fetch;
     if (typeof global.crypto === "undefined") {
-      global.crypto = import_crypto6.default;
+      global.crypto = import_crypto7.default;
     }
     global.fetch = (info2, init2) => {
       init2 = {
@@ -85177,13 +85263,13 @@ __export(studio_exports, {
   prepareSQLiteSchema: () => prepareSQLiteSchema,
   prepareServer: () => prepareServer
 });
-var import_crypto8, import_drizzle_orm8, import_mysql_core3, import_pg_core3, import_sqlite_core3, import_fs12, import_node_https2, preparePgSchema, prepareMySqlSchema, prepareSQLiteSchema, getCustomDefaults, drizzleForPostgres, drizzleForMySQL, drizzleForSQLite, drizzleForLibSQL, extractRelations, init, proxySchema, defaultsSchema, schema4, jsonStringify, prepareServer;
+var import_crypto9, import_drizzle_orm8, import_mysql_core3, import_pg_core3, import_sqlite_core3, import_fs12, import_node_https2, preparePgSchema, prepareMySqlSchema, prepareSQLiteSchema, getCustomDefaults, drizzleForPostgres, drizzleForMySQL, drizzleForSQLite, drizzleForLibSQL, extractRelations, init, proxySchema, defaultsSchema, schema4, jsonStringify, prepareServer;
 var init_studio2 = __esm({
   "src/serializer/studio.ts"() {
     "use strict";
     init_dist2();
     init_esm();
-    import_crypto8 = require("crypto");
+    import_crypto9 = require("crypto");
     import_drizzle_orm8 = require("drizzle-orm");
     import_mysql_core3 = require("drizzle-orm/mysql-core");
     import_pg_core3 = require("drizzle-orm/pg-core");
@@ -85329,7 +85415,7 @@ var init_studio2 = __esm({
       } else {
         dbUrl = `postgresql://${credentials2.user}:${credentials2.password}@${credentials2.host}:${credentials2.port}/${credentials2.database}`;
       }
-      const dbHash = (0, import_crypto8.createHash)("sha256").update(dbUrl).digest("hex");
+      const dbHash = (0, import_crypto9.createHash)("sha256").update(dbUrl).digest("hex");
       return {
         dbHash,
         dialect: "postgresql",
@@ -85351,7 +85437,7 @@ var init_studio2 = __esm({
       } else {
         dbUrl = `mysql://${credentials2.user}:${credentials2.password}@${credentials2.host}:${credentials2.port}/${credentials2.database}`;
       }
-      const dbHash = (0, import_crypto8.createHash)("sha256").update(dbUrl).digest("hex");
+      const dbHash = (0, import_crypto9.createHash)("sha256").update(dbUrl).digest("hex");
       return {
         dbHash,
         dialect: "mysql",
@@ -85377,7 +85463,7 @@ var init_studio2 = __esm({
       } else {
         dbUrl = credentials2.url;
       }
-      const dbHash = (0, import_crypto8.createHash)("sha256").update(dbUrl).digest("hex");
+      const dbHash = (0, import_crypto9.createHash)("sha256").update(dbUrl).digest("hex");
       return {
         dbHash,
         dialect: "sqlite",
@@ -85394,7 +85480,7 @@ var init_studio2 = __esm({
       const sqliteDB = await connectToLibSQL2(credentials2);
       const customDefaults = getCustomDefaults(sqliteSchema2);
       let dbUrl = `turso://${credentials2.url}/${credentials2.authToken}`;
-      const dbHash = (0, import_crypto8.createHash)("sha256").update(dbUrl).digest("hex");
+      const dbHash = (0, import_crypto9.createHash)("sha256").update(dbUrl).digest("hex");
       return {
         dbHash,
         dialect: "sqlite",
@@ -88963,7 +89049,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.27.1-e1194ce";
+  const envVersion = "0.27.2-96d338b";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;