drizzle-kit 0.14.8 → 0.15.1

package/index.js

@@ -10901,10 +10901,11 @@ var init_pgSerializer = __esm({
       const result = {};
       for (const table4 of tables) {
         const tableName = (0, import_table.getTableName)(table4);
+        const { columns, indexes, foreignKeys, checks } = (0, import_utils.getTableConfig)(table4);
         const columnsObject = {};
         const indexesObject = {};
         const foreignKeysObject = {};
-        (0, import_utils.getTableColumns)(table4).forEach((column5) => {
+        columns.forEach((column5) => {
           const notNull = column5.notNull;
           const primaryKey = column5.primary;
           const sqlTypeLowered = column5.getSQLType().toLowerCase();
@@ -10940,7 +10941,7 @@ var init_pgSerializer = __esm({
           }
           columnsObject[column5.name] = columnToSet;
         });
-        const foreignKeys = (0, import_utils.getTableForeignKeys)(table4).map((fk4) => {
+        const fks = foreignKeys.map((fk4) => {
           const name = fk4.getName();
           const tableFrom = tableName;
           const onDelete = fk4.onDelete;
@@ -10959,18 +10960,18 @@ var init_pgSerializer = __esm({
             onUpdate
           };
         });
-        foreignKeys.forEach((it) => {
+        fks.forEach((it) => {
           foreignKeysObject[it.name] = it;
         });
-        (0, import_utils.getTableIndexes)(table4).forEach((value) => {
+        indexes.forEach((value) => {
           var _a;
-          const columns = value.config.columns;
+          const columns2 = value.config.columns;
           let name = value.config.name;
           name = name ? name : indexName(
             tableName,
-            columns.map((it) => it.name)
+            columns2.map((it) => it.name)
           );
-          let indexColumns = columns.map((it) => {
+          let indexColumns = columns2.map((it) => {
             if (it instanceof import_sql.SQL) {
               return dialect4.sqlToQuery(it).sql;
             } else {
@@ -20570,6 +20571,29 @@ var init_migrate = __esm({
   }
 });
 
+// src/@types/utils.ts
+var init_utils = __esm({
+  "src/@types/utils.ts"() {
+    String.prototype.trimChar = function(char) {
+      let start = 0;
+      let end = this.length;
+      while (start < end && this[start] === char)
+        ++start;
+      while (end > start && this[end - 1] === char)
+        --end;
+      return start > 0 || end < this.length ? this.substring(start, end) : this.toString();
+    };
+    String.prototype.squashSpaces = function() {
+      return this.replace(/  +/g, " ").trim();
+    };
+    String.prototype.camelCase = function() {
+      return this.toLowerCase().replace(/([-_ ][a-z0-9])/g, (group) => {
+        return group.toUpperCase().replace("-", "").replace("_", "").replace(" ", "");
+      });
+    };
+  }
+});
+
 // node_modules/.pnpm/postgres-array@2.0.0/node_modules/postgres-array/index.js
 var require_postgres_array = __commonJS({
   "node_modules/.pnpm/postgres-array@2.0.0/node_modules/postgres-array/index.js"(exports) {
@@ -25001,29 +25025,6 @@ var require_lib3 = __commonJS({
   }
 });
 
-// src/@types/utils.ts
-var init_utils = __esm({
-  "src/@types/utils.ts"() {
-    String.prototype.trimChar = function(char) {
-      let start = 0;
-      let end = this.length;
-      while (start < end && this[start] === char)
-        ++start;
-      while (end > start && this[end - 1] === char)
-        --end;
-      return start > 0 || end < this.length ? this.substring(start, end) : this.toString();
-    };
-    String.prototype.squashSpaces = function() {
-      return this.replace(/  +/g, " ").trim();
-    };
-    String.prototype.camelCase = function() {
-      return this.toLowerCase().replace(/([-_ ][a-z0-9])/g, (group) => {
-        return group.toUpperCase().replace("-", "").replace("_", "").replace(" ", "");
-      });
-    };
-  }
-});
-
 // src/introspect.ts
 var pgImportsList, objToStatement, objToStatement2, timeConfig, importsPatch, relations, schemaToTypeScript, isCyclic, isSelf, column4, createTableColumns, createTableIndexes, createTableFKs;
 var init_introspect = __esm({
@@ -25134,7 +25135,7 @@ var init_introspect = __esm({
         );
         statement += "}";
         const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
-          return it.columnsFrom.length > 1 || isSelf(it) || isCyclic(it);
+          return it.columnsFrom.length > 1 || isSelf(it);
         });
         if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0) {
           statement += ",\n";
@@ -25148,7 +25149,12 @@ var init_introspect = __esm({
         statement += ");";
         return statement;
       });
-      const uniquePgImports = ["pgTable", "pgEnum", ...new Set(imports.pg)];
+      const uniquePgImports = [
+        "pgTable",
+        "pgEnum",
+        "AnyPgColumn",
+        ...new Set(imports.pg)
+      ];
       let result = `import { ${uniquePgImports.join(
         ", "
       )} } from "drizzle-orm-pg"
@@ -25293,7 +25299,7 @@ var init_introspect = __esm({
     createTableColumns = (columns, fks, enumTypes) => {
       let statement = "";
       const oneColumnsFKs = Object.values(fks).filter((it) => {
-        return !isSelf(it) && !isCyclic(it);
+        return !isSelf(it);
       }).filter((it) => it.columnsFrom.length === 1);
       const fkByColumnName = oneColumnsFKs.reduce((res, it) => {
         const arr = res[it.columnsFrom[0]] || [];
@@ -25312,11 +25318,12 @@ var init_introspect = __esm({
             const onDelete = it2.onDelete && it2.onDelete !== "no action" ? it2.onDelete : null;
             const onUpdate = it2.onUpdate && it2.onUpdate !== "no action" ? it2.onUpdate : null;
             const params = { onDelete, onUpdate };
+            const typeSuffix = isCyclic(it2) ? ": AnyPgColumn" : "";
             const paramsStr = objToStatement2(params);
             if (paramsStr) {
-              return `.references(() => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()}, ${paramsStr} )`;
+              return `.references(()${typeSuffix} => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()}, ${paramsStr} )`;
             }
-            return `.references(() => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()})`;
+            return `.references(()${typeSuffix} => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()})`;
           }).join("");
           statement += fksStatement;
         }
@@ -25344,11 +25351,13 @@ var init_introspect = __esm({
     createTableFKs = (fks) => {
       let statement = "";
       fks.forEach((it) => {
+        const isSelf2 = it.tableTo === it.tableFrom;
+        const tableTo = isSelf2 ? "table" : `${it.tableTo.camelCase()}`;
         statement += `		${it.name.camelCase()}: foreignKey({
 `;
         statement += `			columns: [${it.columnsFrom.map((i) => `table.${i.camelCase()}`).join(", ")}],
 `;
-        statement += `			foreignColumns: [${it.columnsTo.map((i) => `${it.tableTo.camelCase()}.${i.camelCase()}`).join(", ")}]
+        statement += `			foreignColumns: [${it.columnsTo.map((i) => `${tableTo}.${i.camelCase()}`).join(", ")}]
 `;
         statement += `		})`;
         statement += it.onUpdate && it.onUpdate !== "no action" ? `.onUpdate("${it.onUpdate}")` : "";
@@ -25672,7 +25681,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.14.8",
+  version: "0.15.1",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Alex Blokh <aleksandrblokh@gmail.com>",
   license: "MIT",
@@ -25725,10 +25734,10 @@ var package_default = {
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^5.1.0",
     dockerode: "^3.3.4",
-    "drizzle-orm": "0.15.0-a90d3bc",
-    "drizzle-orm-mysql": "0.15.0-a90d3bc",
-    "drizzle-orm-pg": "0.15.0-a90d3bc",
-    "drizzle-orm-sqlite": "0.15.0-a90d3bc",
+    "drizzle-orm": "0.15.0-60954a3",
+    "drizzle-orm-mysql": "0.15.0-60954a3",
+    "drizzle-orm-pg": "0.15.0-60954a3",
+    "drizzle-orm-sqlite": "0.15.0-60954a3",
     esbuild: "^0.15.7",
     "esbuild-register": "^3.3.3",
     eslint: "^8.29.0",
@@ -25746,6 +25755,7 @@ var package_default = {
 // src/cli/index.ts
 init_migrate();
 init_snapshotsDiffer();
+init_utils();
 var printVersions = () => {
   console.log(`${source_default.gray(versions())}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.14.8",
+  "version": "0.15.1",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",
@@ -35,10 +35,10 @@
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
     "dockerode": "^3.3.4",
-    "drizzle-orm": "0.15.0-a90d3bc",
-    "drizzle-orm-mysql": "0.15.0-a90d3bc",
-    "drizzle-orm-pg": "0.15.0-a90d3bc",
-    "drizzle-orm-sqlite": "0.15.0-a90d3bc",
+    "drizzle-orm": "0.15.0-60954a3",
+    "drizzle-orm-mysql": "0.15.0-60954a3",
+    "drizzle-orm-pg": "0.15.0-60954a3",
+    "drizzle-orm-sqlite": "0.15.0-60954a3",
     "esbuild": "^0.15.7",
     "esbuild-register": "^3.3.3",
     "eslint": "^8.29.0",

package/readme.md

@@ -86,6 +86,15 @@ $ drizzle-kit generate --dialect pg --schema src/schema.ts
 $ drizzle-kit generate --dialect .. --schema .. --out ./migration-folder
 ## runs generate command and outputs results to ./migration-folder
 ```  
+
+
+**`$ drizzle-kit introspect:pg`** - generate `schema.ts` file from existing PG database within seconds
+```shell
+drizzle-kit introspect:pg --out=migrations/ --connectionString=postgresql://user:pass@host:port/db_name
+
+drizzle-kit introspect:pg --out=migrations/ --host=0.0.0.0 --port=5432 --user=postgres --password=pass --database=db_name --ssl
+```
+
 **`$ drizzle-kit up`** - updates stale snapshots
 `--config` [optional defalut=drizzle.config.json] path to an optional config file\
 `--dialect` [optional default=pg] database dialect, one of -> pg, mysql, sqlite\