drizzle-kit 0.16.9-43ec28a → 0.16.9-54306c5

package/index.js

@@ -12802,7 +12802,7 @@ __export(pgSerializer_exports, {
   generatePgSnapshot: () => generatePgSnapshot,
   indexName: () => indexName
 });
-var import_pg_core2, import_utils6, import_sql2, import_table2, dialect4, indexName, generatePgSnapshot, fromDatabase;
+var import_pg_core2, import_utils6, import_sql2, import_table2, dialect4, indexName, generatePgSnapshot, fromDatabase, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     import_pg_core2 = require("drizzle-orm/pg-core");
@@ -12924,7 +12924,7 @@ var init_pgSerializer = __esm({
         return map;
       }, {});
       const schemasObject = Object.fromEntries(
-        schemas.map((it) => [it.schemaName, it.schemaName])
+        schemas.filter((it) => it.schemaName !== "public").map((it) => [it.schemaName, it.schemaName])
       );
       return {
         version: "5",
@@ -12944,7 +12944,10 @@ var init_pgSerializer = __esm({
       const allTables = await db.query(
         `SELECT table_schema, table_name FROM information_schema.tables WHERE table_schema = 'public';`
       );
-      const schemas = new Set(allTables.rows.map((it) => it.table_schema));
+      const schemas = new Set(
+        allTables.rows.map((it) => it.table_schema)
+      );
+      schemas.delete("public");
       progressCallback("tables", allTables.rows.length, "done");
       let columnsCount = 0;
       let indexesCount = 0;
@@ -13055,7 +13058,7 @@ var init_pgSerializer = __esm({
               const uniqueKey = tableConstraints.rows.filter(
                 (mapRow) => columnName === mapRow.column_name && mapRow.constraint_type === "UNIQUE"
               );
-              const defaultValue = columnResponse.column_default === null ? void 0 : columnResponse.column_default;
+              const defaultValue = defaultForColumn(columnResponse);
               const isSerial = columnType === "serial";
               columnToReturn[columnName] = {
                 name: columnName,
@@ -13108,7 +13111,7 @@ var init_pgSerializer = __esm({
             progressCallback("indexes", indexesCount, "fetching");
             result[tableName] = {
               name: tableName,
-              schema: tableSchema,
+              schema: tableSchema !== "public" ? tableSchema : "",
               columns: columnToReturn,
               indexes: indexToReturn,
               foreignKeys: foreignKeysToReturn
@@ -13161,6 +13164,13 @@ var init_pgSerializer = __esm({
         }
       };
     };
+    defaultForColumn = (column5) => {
+      if (column5.data_type === "serial" || column5.data_type === "smallserial" || column5.data_type === "bigserial") {
+        return void 0;
+      }
+      const defaultValue = column5.column_default === null ? void 0 : column5.column_default;
+      return defaultValue;
+    };
   }
 });
 
@@ -13453,7 +13463,8 @@ var init_sqlgenerator = __esm({
     isPgNativeType = (it) => {
       if (pgNativeTypes.has(it))
         return true;
-      return it.startsWith("varchar(") || it.startsWith("numeric(");
+      const toCheck = it.replace(/ /g, "");
+      return toCheck.startsWith("varchar(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(");
     };
     Convertor = class {
     };
@@ -21986,7 +21997,6 @@ var init_words = __esm({
       "hiroim",
       "hitman",
       "hobgoblin",
-      "holocaust",
       "hulk",
       "human_cannonball",
       "human_fly",
@@ -27387,7 +27397,8 @@ var init_introspect = __esm({
       "interval",
       "bigint",
       "bigserial",
-      "doublePrecision"
+      "doublePrecision",
+      "uuid"
     ]);
     objToStatement = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
@@ -27464,13 +27475,13 @@ var init_introspect = __esm({
         return `export const ${it.name.camelCase()} = pgEnum("${it.name}", [${values}])
 `;
       }).join("").concat("\n");
-      const schemaStatements = Object.entries(schemas).filter((it) => it[0] !== "public").map((it) => {
+      const schemaStatements = Object.entries(schemas).map((it) => {
         return `export const ${it[1]} = pgSchema("${it[0]}");
 `;
       }).join();
       const tableStatements = Object.values(schema4.tables).map((table4) => {
         const schema5 = schemas[table4.schema];
-        const func = schema5 || schema5 === "public" ? "pgTable" : schema5;
+        const func = schema5 ? schema5 : "pgTable";
         let statement = `export const ${table4.name.camelCase()} = ${func}("${table4.name}", {
 `;
         statement += createTableColumns(
@@ -27508,6 +27519,8 @@ var init_introspect = __esm({
 `;
       result += enumStatements;
       result += schemaStatements;
+      result += `import { sql } from "drizzle-orm/sql"
+`;
       result += "\n";
       result += tableStatements.join("\n\n");
       return result;
@@ -27558,6 +27571,11 @@ var init_introspect = __esm({
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
+      if (lowered === "uuid") {
+        let out = `${name.camelCase()}: uuid("${name}")`;
+        out += defaultValue === "gen_random_uuid()" ? ".defaultRandom()" : defaultValue ? `.default(sql\`${defaultValue}\`)` : "";
+        return out;
+      }
       if (lowered.startsWith("numeric")) {
         let params;
         if (lowered.length > 7) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.16.9-43ec28a",
+  "version": "0.16.9-54306c5",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",