drizzle-kit 0.19.0-07024c4 → 0.19.0-9770e22

package/index.cjs

@@ -6127,22 +6127,23 @@ var init_pgSerializer = __esm({
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
       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));
       schemas.delete("public");
-      if (progressCallback) {
-        progressCallback("tables", allTables.rows.length, "done");
-      }
       let columnsCount = 0;
       let indexesCount = 0;
       let foreignKeysCount = 0;
+      let tableCount = 0;
       const all = allTables.rows.map((row) => {
         return new Promise(async (res, rej) => {
           const tableName = row.table_name;
+          if (!tablesFilter(tableName))
+            return res("");
+          tableCount += 1;
           const tableSchema = row.table_schema;
           try {
             const columnToReturn = {};
@@ -6350,6 +6351,9 @@ var init_pgSerializer = __esm({
           res("");
         });
       });
+      if (progressCallback) {
+        progressCallback("tables", tableCount, "done");
+      }
       for await (const _ of all) {
       }
       if (progressCallback) {
@@ -7821,7 +7825,7 @@ var init_words = __esm({
       "mesmero",
       "metal_master",
       "meteorite",
-      "micro/macro",
+      "micromacro",
       "microbe",
       "microchip",
       "micromax",
@@ -8822,7 +8826,7 @@ var init_sqlgenerator = __esm({
           const primaryKeyStatement = column7.primaryKey ? "PRIMARY KEY" : "";
           const notNullStatement = column7.notNull ? "NOT NULL" : "";
           const defaultStatement = column7.default !== void 0 ? `DEFAULT ${column7.default}` : "";
-          const type = isPgNativeType(column7.type) ? column7.type : `${column7.type}`;
+          const type = isPgNativeType(column7.type) ? column7.type : `"${column7.type}"`;
           statement += "	" + `"${column7.name}" ${type} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
           statement += (i === columns.length - 1 ? "" : ",") + "\n";
         }
@@ -8986,9 +8990,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "rename_table" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableNameFrom, tableNameTo, toSchema: schema4 } = statement;
-        const from = schema4 ? `"${schema4}"."${tableNameFrom}"` : `"${tableNameFrom}"`;
-        const to = schema4 ? `"${schema4}"."${tableNameTo}"` : `"${tableNameTo}"`;
+        const { tableNameFrom, tableNameTo, toSchema, fromSchema } = statement;
+        const from = fromSchema ? `"${fromSchema}"."${tableNameFrom}"` : `"${tableNameFrom}"`;
+        const to = `"${tableNameTo}"`;
         return `ALTER TABLE ${from} RENAME TO ${to};`;
       }
     };
@@ -30585,15 +30589,28 @@ var init_mysqlIntrospect = __esm({
       await client.connect();
       return { client, databaseName };
     };
-    mysqlIntrospect = async (config) => {
+    mysqlIntrospect = async (config, filters) => {
       const { client, databaseName } = await connectToMySQL(config);
+      const matchers = filters.map((it) => {
+        return new Minimatch(it);
+      });
+      const filter2 = (tableName) => {
+        if (matchers.length === 0)
+          return true;
+        for (let i = 0; i < matchers.length; i++) {
+          const matcher = matchers[i];
+          if (matcher.match(tableName))
+            return true;
+        }
+        return false;
+      };
       const progress = new IntrospectProgress();
       const res = await (0, import_hanji5.renderWithTask)(
         progress,
         fromDatabase(
           client,
           databaseName,
-          (tableName) => true,
+          filter2,
           (stage, count, status) => {
             progress.update(stage, count, status);
           }
@@ -39489,14 +39506,27 @@ var init_sqliteIntrospect = __esm({
       }
       return {};
     };
-    sqliteIntrospect = async (config) => {
+    sqliteIntrospect = async (config, filters) => {
       const { client } = await connectToSQLite(config);
+      const matchers = filters.map((it) => {
+        return new Minimatch(it);
+      });
+      const filter2 = (tableName) => {
+        if (matchers.length === 0)
+          return true;
+        for (let i = 0; i < matchers.length; i++) {
+          const matcher = matchers[i];
+          if (matcher.match(tableName))
+            return true;
+        }
+        return false;
+      };
       const progress = new IntrospectProgress();
       const res = await (0, import_hanji6.renderWithTask)(
         progress,
         fromDatabase3(
           client,
-          () => true,
+          filter2,
           (stage, count, status) => {
             progress.update(stage, count, status);
           }
@@ -44610,12 +44640,26 @@ var init_pgIntrospect = __esm({
     init_pgSerializer();
     init_introspect();
     init_global();
-    pgIntrospect = async (config) => {
+    init_mjs();
+    pgIntrospect = async (config, filters) => {
       const pool = new import_pg.Pool(config.dbCredentials);
+      const matchers = filters.map((it) => {
+        return new Minimatch(it);
+      });
+      const filter2 = (tableName) => {
+        if (matchers.length === 0)
+          return true;
+        for (let i = 0; i < matchers.length; i++) {
+          const matcher = matchers[i];
+          if (matcher.match(tableName))
+            return true;
+        }
+        return false;
+      };
       const progress = new IntrospectProgress();
       const res = await (0, import_hanji7.renderWithTask)(
         progress,
-        fromDatabase2(pool, (stage, count, status) => {
+        fromDatabase2(pool, filter2, (stage, count, status) => {
           progress.update(stage, count, status);
         })
       );
@@ -44805,7 +44849,7 @@ var package_default = {
     "better-sqlite3": "^8.4.0",
     dockerode: "^3.3.4",
     dotenv: "^16.0.3",
-    "drizzle-orm": "0.26.5-8235b73",
+    "drizzle-orm": "0.27.0-56b9edc",
     esbuild: "^0.17.19",
     "esbuild-register": "^3.4.2",
     eslint: "^8.29.0",
@@ -45687,7 +45731,6 @@ var validateIntrospect = async (options) => {
   if (collisionRes.action === "config") {
     const drizzleConfig = await readDrizzleConfig(options.config);
     const configRes = sqliteCliConfigSchema.safeParse(drizzleConfig);
-    console.log(configRes);
     if (!configRes.success) {
       printConfigConnectionIssues(drizzleConfig);
       process.exit(1);
@@ -46446,7 +46489,9 @@ var introspectPgCommand = new import_commander.Command("introspect:pg").option("
     options
   );
   const { snapshots, journal } = prepareOutFolder2(validatedConfig.out, "pg");
-  const { schema: schema4, ts } = await pgIntrospect2(validatedConfig);
+  const filterConfig = validatedConfig.tablesFilter;
+  const tablesFilter = filterConfig ? typeof filterConfig === "string" ? [filterConfig] : filterConfig : [];
+  const { schema: schema4, ts } = await pgIntrospect2(validatedConfig, tablesFilter);
   const schemaFile = import_path7.default.join(validatedConfig.out, "schema.ts");
   (0, import_fs11.writeFileSync)(schemaFile, ts);
   console.log();
@@ -46497,7 +46542,9 @@ var introspectMySqlCommand = new import_commander.Command("introspect:mysql").op
   const res = await validateMySqlIntrospect(options);
   const out = res.out;
   const { snapshots, journal } = prepareOutFolder2(out, "mysql");
-  const { schema: schema4, ts } = await mysqlIntrospect2(res);
+  const filterConfig = res.tablesFilter;
+  const tablesFilter = filterConfig ? typeof filterConfig === "string" ? [filterConfig] : filterConfig : [];
+  const { schema: schema4, ts } = await mysqlIntrospect2(res, tablesFilter);
   const schemaFile = import_path7.default.join(out, "schema.ts");
   (0, import_fs11.writeFileSync)(schemaFile, ts);
   console.log();
@@ -46548,7 +46595,9 @@ var introspectSQLiteCommand = new import_commander.Command("introspect:sqlite").
   const res = await validateIntrospect(options);
   const out = res.out;
   const { snapshots, journal } = prepareOutFolder2(out, "sqlite");
-  const { schema: schema4, ts } = await sqliteIntrospect2(res);
+  const filterConfig = res.tablesFilter;
+  const tablesFilter = filterConfig ? typeof filterConfig === "string" ? [filterConfig] : filterConfig : [];
+  const { schema: schema4, ts } = await sqliteIntrospect2(res, tablesFilter);
   const schemaFile = import_path7.default.join(out, "schema.ts");
   (0, import_fs11.writeFileSync)(schemaFile, ts);
   console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.0-07024c4",
+  "version": "0.19.0-9770e22",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -75,7 +75,7 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.26.5-8235b73",
+    "drizzle-orm": "0.27.0-56b9edc",
     "esbuild": "^0.17.19",
     "esbuild-register": "^3.4.2",
     "eslint": "^8.29.0",

package/utils.js

@@ -13602,7 +13602,7 @@ var PgCreateTableConvertor = class extends Convertor {
       const primaryKeyStatement = column4.primaryKey ? "PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? "NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? `DEFAULT ${column4.default}` : "";
-      const type = isPgNativeType(column4.type) ? column4.type : `${column4.type}`;
+      const type = isPgNativeType(column4.type) ? column4.type : `"${column4.type}"`;
       statement += "	" + `"${column4.name}" ${type} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
       statement += (i === columns.length - 1 ? "" : ",") + "\n";
     }
@@ -13766,9 +13766,9 @@ var PgRenameTableConvertor = class extends Convertor {
     return statement.type === "rename_table" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableNameFrom, tableNameTo, toSchema: schema4 } = statement;
-    const from = schema4 ? `"${schema4}"."${tableNameFrom}"` : `"${tableNameFrom}"`;
-    const to = schema4 ? `"${schema4}"."${tableNameTo}"` : `"${tableNameTo}"`;
+    const { tableNameFrom, tableNameTo, toSchema, fromSchema } = statement;
+    const from = fromSchema ? `"${fromSchema}"."${tableNameFrom}"` : `"${tableNameFrom}"`;
+    const to = `"${tableNameTo}"`;
     return `ALTER TABLE ${from} RENAME TO ${to};`;
   }
 };