drizzle-kit 0.16.9-43ec28a → 0.16.9-5ee905c

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",
@@ -22959,9 +22969,97 @@ var init_migrate = __esm({
   }
 });
 
+// node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
+function camelCase(input, options) {
+  if (!(typeof input === "string" || Array.isArray(input))) {
+    throw new TypeError("Expected the input to be `string | string[]`");
+  }
+  options = {
+    pascalCase: false,
+    preserveConsecutiveUppercase: false,
+    ...options
+  };
+  if (Array.isArray(input)) {
+    input = input.map((x) => x.trim()).filter((x) => x.length).join("-");
+  } else {
+    input = input.trim();
+  }
+  if (input.length === 0) {
+    return "";
+  }
+  const toLowerCase = options.locale === false ? (string) => string.toLowerCase() : (string) => string.toLocaleLowerCase(options.locale);
+  const toUpperCase = options.locale === false ? (string) => string.toUpperCase() : (string) => string.toLocaleUpperCase(options.locale);
+  if (input.length === 1) {
+    if (SEPARATORS.test(input)) {
+      return "";
+    }
+    return options.pascalCase ? toUpperCase(input) : toLowerCase(input);
+  }
+  const hasUpperCase = input !== toLowerCase(input);
+  if (hasUpperCase) {
+    input = preserveCamelCase(input, toLowerCase, toUpperCase, options.preserveConsecutiveUppercase);
+  }
+  input = input.replace(LEADING_SEPARATORS, "");
+  input = options.preserveConsecutiveUppercase ? preserveConsecutiveUppercase(input, toLowerCase) : toLowerCase(input);
+  if (options.pascalCase) {
+    input = toUpperCase(input.charAt(0)) + input.slice(1);
+  }
+  return postProcess(input, toUpperCase);
+}
+var UPPERCASE, LOWERCASE, LEADING_CAPITAL, IDENTIFIER, SEPARATORS, LEADING_SEPARATORS, SEPARATORS_AND_IDENTIFIER, NUMBERS_AND_IDENTIFIER, preserveCamelCase, preserveConsecutiveUppercase, postProcess;
+var init_camelcase = __esm({
+  "node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js"() {
+    UPPERCASE = /[\p{Lu}]/u;
+    LOWERCASE = /[\p{Ll}]/u;
+    LEADING_CAPITAL = /^[\p{Lu}](?![\p{Lu}])/gu;
+    IDENTIFIER = /([\p{Alpha}\p{N}_]|$)/u;
+    SEPARATORS = /[_.\- ]+/;
+    LEADING_SEPARATORS = new RegExp("^" + SEPARATORS.source);
+    SEPARATORS_AND_IDENTIFIER = new RegExp(SEPARATORS.source + IDENTIFIER.source, "gu");
+    NUMBERS_AND_IDENTIFIER = new RegExp("\\d+" + IDENTIFIER.source, "gu");
+    preserveCamelCase = (string, toLowerCase, toUpperCase, preserveConsecutiveUppercase2) => {
+      let isLastCharLower = false;
+      let isLastCharUpper = false;
+      let isLastLastCharUpper = false;
+      let isLastLastCharPreserved = false;
+      for (let index4 = 0; index4 < string.length; index4++) {
+        const character = string[index4];
+        isLastLastCharPreserved = index4 > 2 ? string[index4 - 3] === "-" : true;
+        if (isLastCharLower && UPPERCASE.test(character)) {
+          string = string.slice(0, index4) + "-" + string.slice(index4);
+          isLastCharLower = false;
+          isLastLastCharUpper = isLastCharUpper;
+          isLastCharUpper = true;
+          index4++;
+        } else if (isLastCharUpper && isLastLastCharUpper && LOWERCASE.test(character) && (!isLastLastCharPreserved || preserveConsecutiveUppercase2)) {
+          string = string.slice(0, index4 - 1) + "-" + string.slice(index4 - 1);
+          isLastLastCharUpper = isLastCharUpper;
+          isLastCharUpper = false;
+          isLastCharLower = true;
+        } else {
+          isLastCharLower = toLowerCase(character) === character && toUpperCase(character) !== character;
+          isLastLastCharUpper = isLastCharUpper;
+          isLastCharUpper = toUpperCase(character) === character && toLowerCase(character) !== character;
+        }
+      }
+      return string;
+    };
+    preserveConsecutiveUppercase = (input, toLowerCase) => {
+      LEADING_CAPITAL.lastIndex = 0;
+      return input.replace(LEADING_CAPITAL, (m1) => toLowerCase(m1));
+    };
+    postProcess = (input, toUpperCase) => {
+      SEPARATORS_AND_IDENTIFIER.lastIndex = 0;
+      NUMBERS_AND_IDENTIFIER.lastIndex = 0;
+      return input.replace(SEPARATORS_AND_IDENTIFIER, (_, identifier) => toUpperCase(identifier)).replace(NUMBERS_AND_IDENTIFIER, (m) => toUpperCase(m));
+    };
+  }
+});
+
 // src/@types/utils.ts
 var init_utils2 = __esm({
   "src/@types/utils.ts"() {
+    init_camelcase();
     String.prototype.trimChar = function(char) {
       let start = 0;
       let end = this.length;
@@ -22975,9 +23073,10 @@ var init_utils2 = __esm({
       return this.replace(/  +/g, " ").trim();
     };
     String.prototype.camelCase = function() {
-      return this.toLowerCase().replace(/([-_ ][a-z0-9])/g, (group) => {
-        return group.toUpperCase().replace("-", "").replace("_", "").replace(" ", "");
-      });
+      return camelCase(String(this));
+    };
+    String.prototype.concatIf = function(it, condition) {
+      return condition ? `${this}${it}` : this;
     };
     Array.prototype.random = function() {
       return this[~~(Math.random() * this.length)];
@@ -27387,7 +27486,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 +27564,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 +27608,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 +27660,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) {
@@ -27641,7 +27748,10 @@ var init_introspect = __esm({
       if (enumTypes.has(type)) {
         return `${name.camelCase()}: ${type.camelCase()}("${name}")`;
       }
-      console.log("uknown", type);
+      let unknown = `// TODO: failed to parse database type '${type}'
+`;
+      unknown += `	${name.camelCase()}: unknown("${name}")`;
+      return unknown;
     };
     createTableColumns = (columns, fks, enumTypes) => {
       let statement = "";
@@ -27655,8 +27765,9 @@ var init_introspect = __esm({
         return res;
       }, {});
       columns.forEach((it) => {
+        const columnStatement = column4(it.type, it.name, enumTypes, it.default);
         statement += "	";
-        statement += column4(it.type, it.name, enumTypes, it.default);
+        statement += columnStatement;
         statement += it.primaryKey ? ".primaryKey()" : "";
         statement += it.notNull ? ".notNull()" : "";
         const fks2 = fkByColumnName[it.name];
@@ -27915,6 +28026,7 @@ var package_default = {
     ]
   },
   dependencies: {
+    camelcase: "^7.0.1",
     chalk: "^5.2.0",
     commander: "^9.4.1",
     esbuild: "^0.15.18",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.16.9-43ec28a",
+  "version": "0.16.9-5ee905c",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",
@@ -38,6 +38,7 @@
     ]
   },
   "dependencies": {
+    "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
     "esbuild": "^0.15.18",