drizzle-kit 0.22.0-72736ba → 0.22.0-a8a3158

package/bin.cjs

@@ -1092,7 +1092,7 @@ var init_views = __esm({
       return source_default.grey(msg);
     };
     error = (error2, greyMsg = "") => {
-      return `${source_default.red.bold("Err:")} ${error2} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
+      return `${source_default.bgRed.bold(" Error ")} ${error2} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
     };
     schema = (schema5) => {
       const tables = Object.values(schema5.tables);
@@ -1451,6 +1451,9 @@ Is ${source_default.bold.blue(
 function assertUnreachable(x3) {
   throw new Error("Didn't expect to get here");
 }
+function softAssertUnreachable(x3) {
+  return null;
+}
 var originUUID, snapshotVersion, mapValues, mapKeys, mapEntries;
 var init_global = __esm({
   "src/global.ts"() {
@@ -7281,7 +7284,7 @@ var require_coerce = __commonJS({
     var SemVer = require_semver();
     var parse7 = require_parse();
     var { safeRe: re2, t: t2 } = require_re();
-    var coerce3 = (version2, options) => {
+    var coerce2 = (version2, options) => {
       if (version2 instanceof SemVer) {
         return version2;
       }
@@ -7316,7 +7319,7 @@ var require_coerce = __commonJS({
       const build = options.includePrerelease && match2[6] ? `+${match2[6]}` : "";
       return parse7(`${major}.${minor}.${patch}${prerelease}${build}`, options);
     };
-    module2.exports = coerce3;
+    module2.exports = coerce2;
   }
 });
 
@@ -8317,7 +8320,7 @@ var require_semver2 = __commonJS({
     var gte = require_gte();
     var lte = require_lte();
     var cmp = require_cmp();
-    var coerce3 = require_coerce();
+    var coerce2 = require_coerce();
     var Comparator = require_comparator();
     var Range = require_range();
     var satisfies = require_satisfies();
@@ -8355,7 +8358,7 @@ var require_semver2 = __commonJS({
       gte,
       lte,
       cmp,
-      coerce: coerce3,
+      coerce: coerce2,
       Comparator,
       Range,
       satisfies,
@@ -8575,12 +8578,137 @@ var init_utils3 = __esm({
   }
 });
 
+// src/schemaValidator.ts
+var dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    "use strict";
+    init_lib();
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
+    commonSquashedSchema = unionType([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = unionType([
+      pgSchema,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
+// src/cli/validations/common.ts
+var assertCollisions, sqliteDriversLiterals, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema, wrapParam;
+var init_common = __esm({
+  "src/cli/validations/common.ts"() {
+    "use strict";
+    init_outputs();
+    init_lib();
+    init_schemaValidator();
+    init_source();
+    assertCollisions = (options, command, inputWhitelist = []) => {
+      const { config, ...rest } = options;
+      let atLeastOneParam = false;
+      for (const key of Object.keys(rest)) {
+        if (inputWhitelist.includes(key))
+          continue;
+        atLeastOneParam = true;
+      }
+      if (!atLeastOneParam && typeof config !== "undefined") {
+        return "config";
+      }
+      if (typeof config === "undefined" && atLeastOneParam) {
+        return "cli";
+      }
+      if (typeof config === "undefined" && !atLeastOneParam) {
+        return "config";
+      }
+      console.log(outputs.common.ambiguousParams(command));
+      process.exit(1);
+    };
+    sqliteDriversLiterals = [
+      literalType("turso"),
+      literalType("d1-http"),
+      literalType("expo")
+    ];
+    sqliteDriver = unionType(sqliteDriversLiterals);
+    postgresDriver = literalType("aws-data-api");
+    mysqlDriver = literalType("mysql2");
+    driver = unionType([sqliteDriver, postgresDriver, mysqlDriver]);
+    configCommonSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional(),
+      breakpoints: booleanType().optional().default(true),
+      driver: driver.optional(),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
+    });
+    casing = unionType([literalType("camel"), literalType("preserve")]).default(
+      "preserve"
+    );
+    introspectParams = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspect: objectType({
+        casing
+      }).default({ casing: "camel" })
+    });
+    configIntrospectCliSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspectCasing: unionType([literalType("camel"), literalType("preserve")]).default(
+        "camel"
+      )
+    });
+    configGenerateSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true)
+    });
+    configPushSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      verbose: booleanType().default(false),
+      strict: booleanType().default(false),
+      out: stringType().optional()
+    });
+    wrapParam = (name, param, optional = false) => {
+      const check = `[${source_default.green("\u2713")}]`;
+      const cross = `[${source_default.red("x")}]`;
+      if (typeof param === "string") {
+        if (param.length === 0) {
+          return `    ${cross} ${name}: ''`;
+        }
+        return `    ${check} ${name}: '${param}'`;
+      }
+      if (optional) {
+        return source_default.gray(`        ${name}?: `);
+      }
+      return `    ${cross} ${name}: ${source_default.gray("undefined")}`;
+    };
+  }
+});
+
 // src/cli/validations/outputs.ts
 var withStyle, outputs;
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
     "use strict";
     init_source();
+    init_common();
     withStyle = {
       error: (str) => `${source_default.red(`${source_default.white.bgRed(" Invalid input ")} ${str}`)}`,
       warning: (str) => `${source_default.white.bgGray(" Warning ")} ${str}`,
@@ -8630,14 +8758,17 @@ var init_outputs = __esm({
       },
       sqlite: {
         connection: {
-          driver: () => withStyle.error(
-            `Either "turso", "libsql", "better-sqlite" are available options for "--driver"`
-          ),
-          url: (driver2) => withStyle.error(
-            `"url" is a required option for driver "${driver2}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
+          driver: () => {
+            const listOfDrivers = sqliteDriversLiterals.map((it) => `'${it.value}'`).join(", ");
+            return withStyle.error(
+              `Either ${listOfDrivers} are available options for 'driver' param`
+            );
+          },
+          url: (driver3) => withStyle.error(
+            `"url" is a required option for driver "${driver3}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
           ),
-          authToken: (driver2) => withStyle.error(
-            `"authToken" is a required option for driver "${driver2}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
+          authToken: (driver3) => withStyle.error(
+            `"authToken" is a required option for driver "${driver3}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
           )
         },
         introspect: {},
@@ -8654,13 +8785,15 @@ var init_mysql = __esm({
     "use strict";
     init_lib();
     init_outputs();
+    init_common();
+    init_views();
     mysqlCredentials = unionType([
       objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType(),
+        host: stringType().min(1),
+        port: coerce.number().min(1).optional(),
+        user: stringType().min(1).optional(),
+        password: stringType().min(1).optional(),
+        database: stringType().min(1),
         ssl: unionType([
           stringType(),
           objectType({
@@ -8676,35 +8809,47 @@ var init_mysql = __esm({
         ]).optional()
       }),
       objectType({
-        url: stringType()
+        url: stringType().min(1)
       })
     ]);
     printConfigConnectionIssues = (options) => {
-      if (options.driver !== "mysql2") {
-        console.log(outputs.mysql.connection.driver());
-      }
-      const { uri, connectionString, url, host, database } = options;
-      if (!uri && !connectionString && !url && (!host || !database)) {
-        console.log(outputs.mysql.connection.required());
+      if ("url" in options) {
+        let text2 = `Please provide required params for MySQL driver:
+`;
+        console.log(error(text2));
+        console.log(wrapParam("url", options.url));
+        process.exit(1);
       }
+      let text = `Please provide required params for MySQL driver:
+`;
+      console.log(error(text));
+      console.log(wrapParam("host", options.host));
+      console.log(wrapParam("port", options.port, true));
+      console.log(wrapParam("user", options.user, true));
+      console.log(wrapParam("password", options.password, true));
+      console.log(wrapParam("database", options.database));
+      console.log(wrapParam("ssl", options.ssl, true));
+      process.exit(1);
     };
   }
 });
 
-// src/cli/validations/pg.ts
+// src/cli/validations/postgres.ts
 var postgresCredentials, printConfigConnectionIssues2;
-var init_pg = __esm({
-  "src/cli/validations/pg.ts"() {
+var init_postgres = __esm({
+  "src/cli/validations/postgres.ts"() {
     "use strict";
     init_lib();
-    init_outputs();
+    init_common();
+    init_views();
     postgresCredentials = unionType([
       objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("postgres"),
-        password: stringType().optional(),
-        database: stringType(),
+        driver: undefinedType(),
+        host: stringType().min(1),
+        port: coerce.number().min(1).optional(),
+        user: stringType().min(1).optional(),
+        password: stringType().min(1).optional(),
+        database: stringType().min(1),
         ssl: unionType([
           literalType("require"),
           literalType("allow"),
@@ -8712,26 +8857,60 @@ var init_pg = __esm({
           literalType("verify-full"),
           booleanType(),
           objectType({}).passthrough()
-        ])
+        ]).optional()
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
       objectType({
-        url: stringType()
+        driver: undefinedType(),
+        url: stringType().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
       objectType({
         driver: literalType("aws-data-api"),
-        database: stringType(),
-        secretArn: stringType(),
-        resourceArn: stringType()
+        database: stringType().min(1),
+        secretArn: stringType().min(1),
+        resourceArn: stringType().min(1)
       })
     ]);
     printConfigConnectionIssues2 = (options) => {
       if (options.driver === "aws-data-api") {
-        console.log(outputs.postgres.connection.awsDataApi());
-        return;
+        let text = `Please provide required params for AWS Data API driver:
+`;
+        console.log(error(text));
+        console.log(wrapParam("database", options.database));
+        console.log(wrapParam("secretArn", options.secretArn));
+        console.log(wrapParam("resourceArn", options.resourceArn));
+        process.exit(1);
+      }
+      if ("url" in options) {
+        let text = `Please provide required params for Postgres driver:
+`;
+        console.log(error(text));
+        console.log(wrapParam("url", options.url));
+        process.exit(1);
       }
-      if (!("url" in options) && !("host" in options || "database" in options)) {
-        console.log(outputs.postgres.connection.required());
+      if ("host" in options || "database" in options) {
+        let text = `Please provide required params for Postgres driver:
+`;
+        console.log(error(text));
+        console.log(wrapParam("host", options.host));
+        console.log(wrapParam("port", options.port, true));
+        console.log(wrapParam("user", options.user, true));
+        console.log(wrapParam("password", options.password, true));
+        console.log(wrapParam("database", options.database));
+        console.log(wrapParam("ssl", options.ssl, true));
+        process.exit(1);
       }
+      console.log(
+        error(
+          `Either connection "url" or "host", "database" are required for database connection`
+        )
+      );
+      process.exit(1);
     };
   }
 });
@@ -8742,154 +8921,77 @@ var init_sqlite = __esm({
   "src/cli/validations/sqlite.ts"() {
     "use strict";
     init_lib();
-    init_outputs();
+    init_common();
+    init_views();
+    init_global();
     sqliteCredentials = unionType([
       objectType({
         driver: literalType("turso"),
-        url: stringType(),
-        authToken: stringType()
+        url: stringType().min(1),
+        authToken: stringType().min(1).optional()
       }),
       objectType({
         driver: literalType("d1-http"),
-        accountId: stringType(),
-        databaseId: stringType(),
-        token: stringType()
+        accountId: stringType().min(1),
+        databaseId: stringType().min(1),
+        token: stringType().min(1)
       }),
       objectType({
-        url: stringType()
+        driver: undefinedType(),
+        url: stringType().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       })
     ]);
-    printConfigConnectionIssues3 = (options) => {
-      if (options.driver === "turso") {
-        if (!options.url) {
-          console.log(outputs.sqlite.connection.url("turso"));
-        }
-        if (!options.authToken) {
-          console.log(outputs.sqlite.connection.authToken("turso"));
-        }
-      } else if (options.driver === "libsql") {
-        if (!options.url) {
-          console.log(outputs.sqlite.connection.url("libsql"));
-        }
-      } else if (options.driver === "better-sqlite") {
-        if (!options.url) {
-          console.log(outputs.sqlite.connection.url("better-sqlite"));
+    printConfigConnectionIssues3 = (options, command) => {
+      const parsedDriver = sqliteDriver.safeParse(options.driver);
+      const driver3 = parsedDriver.success ? parsedDriver.data : "";
+      if (driver3 === "expo") {
+        if (command === "migrate") {
+          console.log(
+            error(
+              `You can't use 'migrate' command with Expo SQLite, please follow migration instructions in our docs - https://orm.drizzle.team/docs/get-started-sqlite#expo-sqlite`
+            )
+          );
+        } else if (command === "studio") {
+          console.log(
+            error(
+              `You can't use 'studio' command with Expo SQLite, please use Expo Plugin https://www.npmjs.com/package/expo-drizzle-studio-plugin`
+            )
+          );
+        } else if (command === "pull") {
+          console.log(error("You can't use 'pull' command with Expo SQLite"));
+        } else if (command === "push") {
+          console.log(error("You can't use 'push' command with Expo SQLite"));
+        } else {
+          console.log(error("Unexpected error with expo driver \u{1F914}"));
         }
+        process.exit(1);
+      } else if (driver3 === "d1-http") {
+        let text2 = `Please provide required params for D1 HTTP driver:
+`;
+        console.log(error(text2));
+        console.log(wrapParam("accountId", options.accountId));
+        console.log(wrapParam("databaseId", options.databaseId));
+        console.log(wrapParam("token", options.token));
+        process.exit(1);
+      } else if (driver3 === "turso") {
+        let text2 = `Please provide required params for Turso driver:
+`;
+        console.log(error(text2));
+        console.log(wrapParam("url", options.url));
+        console.log(wrapParam("authToken", options.authToken));
+        return;
       } else {
-        console.log(outputs.sqlite.connection.driver());
+        softAssertUnreachable(driver3);
       }
-    };
-  }
-});
-
-// src/schemaValidator.ts
-var dialect3, commonSquashedSchema, commonSchema;
-var init_schemaValidator = __esm({
-  "src/schemaValidator.ts"() {
-    "use strict";
-    init_lib();
-    init_mysqlSchema();
-    init_pgSchema();
-    init_sqliteSchema();
-    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
-    commonSquashedSchema = unionType([
-      pgSchemaSquashed,
-      mysqlSchemaSquashed,
-      SQLiteSchemaSquashed
-    ]);
-    commonSchema = unionType([
-      pgSchema,
-      mysqlSchema,
-      sqliteSchema
-    ]);
-  }
-});
-
-// src/cli/validations/common.ts
-var assertCollisions, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
-var init_common = __esm({
-  "src/cli/validations/common.ts"() {
-    "use strict";
-    init_outputs();
-    init_lib();
-    init_schemaValidator();
-    assertCollisions = (options, command, inputWhitelist = []) => {
-      const { config, ...rest } = options;
-      let atLeastOneParam = false;
-      for (const key of Object.keys(rest)) {
-        if (inputWhitelist.includes(key))
-          continue;
-        atLeastOneParam = true;
-      }
-      if (!atLeastOneParam && typeof config !== "undefined") {
-        return "config";
-      }
-      if (typeof config === "undefined" && atLeastOneParam) {
-        return "cli";
-      }
-      if (typeof config === "undefined" && !atLeastOneParam) {
-        return "config";
-      }
-      console.log(outputs.common.ambiguousParams(command));
+      let text = `Please provide required params:
+`;
+      console.log(error(text));
+      console.log(wrapParam("url", options.url));
       process.exit(1);
     };
-    sqliteDriver = unionType([
-      literalType("better-sqlite"),
-      literalType("turso"),
-      literalType("libsql"),
-      literalType("d1"),
-      literalType("d1-http"),
-      literalType("expo")
-    ]);
-    postgresDriver = literalType("aws-data-api");
-    mysqlDriver = literalType("mysql2");
-    driver = unionType([sqliteDriver, postgresDriver, mysqlDriver]);
-    configCommonSchema = objectType({
-      dialect: dialect3,
-      schema: unionType([stringType(), stringType().array()]).optional(),
-      out: stringType().optional(),
-      breakpoints: booleanType().optional().default(true),
-      driver: driver.optional(),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
-    });
-    casing = unionType([literalType("camel"), literalType("preserve")]).default(
-      "preserve"
-    );
-    introspectParams = objectType({
-      schema: unionType([stringType(), stringType().array()]).optional(),
-      out: stringType().optional().default("./drizzle"),
-      breakpoints: booleanType().default(true),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
-      introspect: objectType({
-        casing
-      }).default({ casing: "camel" })
-    });
-    configIntrospectCliSchema = objectType({
-      schema: unionType([stringType(), stringType().array()]).optional(),
-      out: stringType().optional().default("./drizzle"),
-      breakpoints: booleanType().default(true),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
-      introspectCasing: unionType([literalType("camel"), literalType("preserve")]).default(
-        "camel"
-      )
-    });
-    configGenerateSchema = objectType({
-      schema: unionType([stringType(), stringType().array()]),
-      out: stringType().optional().default("./drizzle"),
-      breakpoints: booleanType().default(true)
-    });
-    configPushSchema = objectType({
-      dialect: dialect3,
-      schema: unionType([stringType(), stringType().array()]),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
-      verbose: booleanType().default(false),
-      strict: booleanType().default(false),
-      out: stringType().optional()
-    });
   }
 });
 
@@ -8915,6 +9017,7 @@ var init_cli = __esm({
       schema: unionType([stringType(), stringType().array()]).optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
       schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      extensionsFilters: literalType("postgis").array().optional(),
       verbose: booleanType().optional(),
       strict: booleanType().optional()
     }).passthrough();
@@ -8924,6 +9027,7 @@ var init_cli = __esm({
       out: stringType().optional().default("drizzle"),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
       schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      extensionsFilters: literalType("postgis").array().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true)
     }).passthrough();
@@ -8949,7 +9053,7 @@ var init_studio = __esm({
     init_mysql();
     init_sqlite();
     init_schemaValidator();
-    init_pg();
+    init_postgres();
     credentials = intersectionType(
       postgresCredentials,
       mysqlCredentials,
@@ -9103,7 +9207,7 @@ var require_common = __commonJS({
     function setup(env3) {
       createDebug.debug = createDebug;
       createDebug.default = createDebug;
-      createDebug.coerce = coerce3;
+      createDebug.coerce = coerce2;
       createDebug.disable = disable;
       createDebug.enable = enable;
       createDebug.enabled = enabled;
@@ -9244,7 +9348,7 @@ var require_common = __commonJS({
       function toNamespace(regexp) {
         return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
       }
-      function coerce3(val2) {
+      function coerce2(val2) {
         if (val2 instanceof Error) {
           return val2.stack || val2.message;
         }
@@ -14599,7 +14703,7 @@ var init_utils4 = __esm({
     import_hanji2 = __toESM(require_hanji());
     init_global();
     init_mysql();
-    init_pg();
+    init_postgres();
     init_sqlite();
     init_common();
     init_schemaValidator();
@@ -14733,6 +14837,13 @@ 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") && dialect7 === "postgresql") {
+          tablesFilter.push(
+            ...["!geography_columns", "!geometry_columns", "!spatial_ref_sys"]
+          );
+        }
+      }
       if (dialect7 === "postgresql") {
         const parsed = postgresCredentials.safeParse(config);
         if (!parsed.success) {
@@ -14768,7 +14879,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(config);
         if (!parsed.success) {
-          printConfigConnectionIssues3(config);
+          printConfigConnectionIssues3(config, "pull");
           process.exit(1);
         }
         return {
@@ -14799,6 +14910,13 @@ var init_utils4 = __esm({
       }
       const tablesFilterConfig = config.tablesFilter;
       const tablesFilter = tablesFilterConfig ? typeof tablesFilterConfig === "string" ? [tablesFilterConfig] : tablesFilterConfig : [];
+      if (config.extensionsFilters) {
+        if (config.extensionsFilters.includes("postgis") && dialect7 === "postgresql") {
+          tablesFilter.push(
+            ...["!geography_columns", "!geometry_columns", "!spatial_ref_sys"]
+          );
+        }
+      }
       const schemasFilterConfig = config.schemaFilter;
       const schemasFilter = schemasFilterConfig ? typeof schemasFilterConfig === "string" ? [schemasFilterConfig] : schemasFilterConfig : [];
       if (dialect7 === "postgresql") {
@@ -14836,7 +14954,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(config);
         if (!parsed.success) {
-          printConfigConnectionIssues3(config);
+          printConfigConnectionIssues3(config, "pull");
           process.exit(1);
         }
         return {
@@ -14901,7 +15019,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(flattened);
         if (!parsed.success) {
-          printConfigConnectionIssues3(flattened);
+          printConfigConnectionIssues3(flattened, "studio");
           process.exit(1);
         }
         const credentials2 = parsed.data;
@@ -14976,7 +15094,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(flattened);
         if (!parsed.success) {
-          printConfigConnectionIssues3(flattened);
+          printConfigConnectionIssues3(flattened, "migrate");
           process.exit(1);
         }
         const credentials2 = parsed.data;
@@ -15037,8 +15155,9 @@ var init_utils4 = __esm({
       unregister();
       const res = configCommonSchema.safeParse(content);
       if (!res.success) {
-        console.error(res.error);
-        console.log("Missing required params");
+        if (!("dialect" in content)) {
+          console.log(error("Please specify 'dialect' param"));
+        }
         process.exit(1);
       }
       return res.data;
@@ -15300,7 +15419,7 @@ The unique constraint ${source_default.underline.blue(
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
             if ((0, import_drizzle_orm2.is)(it, import_drizzle_orm3.SQL)) {
-              return dialect4.sqlToQuery(it).sql;
+              return dialect4.sqlToQuery(it, "indexes").sql;
             } else {
               return it.name;
             }
@@ -16275,7 +16394,7 @@ ${withStyle.errorWarning(
                 name: columnName,
                 type: (
                   // filter vectors, but in future we should filter any extension that was installed by user
-                  columnAdditionalDT === "USER-DEFINED" && enumType3 !== "vector" ? enumType3 : columnTypeMapped
+                  columnAdditionalDT === "USER-DEFINED" && !["vector", "geometry"].includes(enumType3) ? enumType3 : columnTypeMapped
                 ),
                 typeSchema: enumsToReturn[`${tableSchema}.${enumType3}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType3}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,
@@ -16675,7 +16794,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
             if ((0, import_drizzle_orm7.is)(it, import_drizzle_orm7.SQL)) {
-              return dialect6.sqlToQuery(it).sql;
+              return dialect6.sqlToQuery(it, "indexes").sql;
             } else {
               return it.name;
             }
@@ -24912,14 +25031,14 @@ var require_to_regex_range = __commonJS({
       }
       return tokens;
     }
-    function filterPatterns(arr, comparison, prefix, intersection2, options) {
+    function filterPatterns(arr, comparison, prefix, intersection, options) {
       let result = [];
       for (let ele of arr) {
         let { string } = ele;
-        if (!intersection2 && !contains(comparison, "string", string)) {
+        if (!intersection && !contains(comparison, "string", string)) {
           result.push(prefix + string);
         }
-        if (intersection2 && contains(comparison, "string", string)) {
+        if (intersection && contains(comparison, "string", string)) {
           result.push(prefix + string);
         }
       }
@@ -111918,11 +112037,11 @@ var init_connections = __esm({
       );
       process.exit(1);
     };
-    prepareSqliteParams = (params, driver2) => {
+    prepareSqliteParams = (params, driver3) => {
       return params.map((param) => {
         if (param && typeof param === "object" && "type" in param && "value" in param && param.type === "binary") {
           const value = typeof param.value === "object" ? JSON.stringify(param.value) : param.value;
-          if (driver2 === "d1-http") {
+          if (driver3 === "d1-http") {
             return value;
           }
           return Buffer.from(value);
@@ -111932,8 +112051,8 @@ var init_connections = __esm({
     };
     connectToSQLite = async (credentials2) => {
       if ("driver" in credentials2) {
-        const { driver: driver2 } = credentials2;
-        if (driver2 === "turso") {
+        const { driver: driver3 } = credentials2;
+        if (driver3 === "turso") {
           assertPackages("@libsql/client");
           const { createClient: createClient2 } = await import("@libsql/client");
           const { drizzle } = await import("drizzle-orm/libsql");
@@ -111970,12 +112089,12 @@ var init_connections = __esm({
             }
           };
           return { ...db2, ...proxy, migrate: migrateFn };
-        } else if (driver2 === "d1-http") {
+        } else if (driver3 === "d1-http") {
           const { drizzle } = await import("drizzle-orm/sqlite-proxy");
           const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
           const remoteCallback = async (sql2, params, method) => {
             const res = await fetch2(
-              `https://api.cloudflare.com/client/v4/accounts/${credentials2.accountId}/d1/database/${credentials2.databaseId}/query`,
+              `https://api.cloudflare.com/client/v4/accounts/${credentials2.accountId}/d1/database/${credentials2.databaseId}/${method === "values" ? "raw" : "query"}`,
               {
                 method: "POST",
                 body: JSON.stringify({ sql: sql2, params }),
@@ -111991,9 +112110,10 @@ var init_connections = __esm({
                 data.errors.map((it) => `${it.code}: ${it.message}`).join("\n")
               );
             }
-            const rows = data.result[0].results;
+            const result = data.result[0].results;
+            const rows = Array.isArray(result) ? result : result.rows;
             return {
-              rows: method === "values" ? rows.map((row) => Object.values(row)) : rows
+              rows
             };
           };
           const drzl = drizzle(remoteCallback);
@@ -112030,7 +112150,7 @@ var init_connections = __esm({
           };
           return { ...db2, ...proxy, migrate: migrateFn };
         } else {
-          assertUnreachable(driver2);
+          assertUnreachable(driver3);
         }
       }
       if (await checkPackage("@libsql/client")) {
@@ -115560,7 +115680,10 @@ var init_introspect_pg = __esm({
       "bigint",
       "doublePrecision",
       "uuid",
-      "vector"
+      "vector",
+      "point",
+      "line",
+      "geometry"
     ]);
     objToStatement23 = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
@@ -115698,6 +115821,7 @@ var init_introspect_pg = __esm({
             patched = patched.startsWith("time(") ? "time" : patched;
             patched = patched.startsWith("timestamp(") ? "timestamp" : patched;
             patched = patched.startsWith("vector(") ? "vector" : patched;
+            patched = patched.startsWith("geometry(") ? "geometry" : patched;
             return patched;
           }).filter((type) => {
             return pgImportsList.has(type);
@@ -115948,6 +116072,41 @@ var init_introspect_pg = __esm({
         out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
         return out;
       }
+      if (lowered.startsWith("point")) {
+        let out = `${withCasing2(name, casing2)}: point("${name}")`;
+        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        return out;
+      }
+      if (lowered.startsWith("line")) {
+        let out = `${withCasing2(name, casing2)}: point("${name}")`;
+        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        return out;
+      }
+      if (lowered.startsWith("geometry")) {
+        let out = "";
+        let isGeoUnknown = false;
+        if (lowered.length !== 8) {
+          const geometryOptions = lowered.slice(9, -1).split(",");
+          if (geometryOptions.length === 1 && geometryOptions[0] !== "") {
+            out = `${withCasing2(name, casing2)}: geometry("${name}", { type: "${geometryOptions[0]}" })`;
+          } else if (geometryOptions.length === 2) {
+            out = `${withCasing2(name, casing2)}: geometry("${name}", { type: "${geometryOptions[0]}", srid: ${geometryOptions[1]} })`;
+          } else {
+            isGeoUnknown = true;
+          }
+        } else {
+          out = `${withCasing2(name, casing2)}: geometry("${name}")`;
+        }
+        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        if (isGeoUnknown) {
+          let unknown2 = `// TODO: failed to parse geometry type because found more than 2 options inside geometry function '${type}'
+// Introspect is currently supporting only type and srid options
+`;
+          unknown2 += `	${withCasing2(name, casing2)}: unknown("${name}")`;
+          return unknown2;
+        }
+        return out;
+      }
       if (lowered.startsWith("vector")) {
         const split = lowered.split(" ");
         let out;
@@ -116564,10 +116723,19 @@ var init_introspect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -116638,10 +116806,19 @@ var init_introspect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -116710,10 +116887,19 @@ var init_introspect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -120265,13 +120451,13 @@ var init_studio2 = __esm({
       const customDefaults = getCustomDefaults(sqliteSchema2);
       let dbUrl;
       if ("driver" in credentials2) {
-        const { driver: driver2 } = credentials2;
-        if (driver2 === "d1-http") {
+        const { driver: driver3 } = credentials2;
+        if (driver3 === "d1-http") {
           dbUrl = `d1-http://${credentials2.accountId}/${credentials2.databaseId}/${credentials2.token}`;
-        } else if (driver2 === "turso") {
+        } else if (driver3 === "turso") {
           dbUrl = `turso://${credentials2.url}/${credentials2.authToken}`;
         } else {
-          assertUnreachable(driver2);
+          assertUnreachable(driver3);
         }
       } else {
         dbUrl = credentials2.url;
@@ -120383,7 +120569,7 @@ var init_studio2 = __esm({
     };
     prepareServer = async ({
       dialect: dialect7,
-      driver: driver2,
+      driver: driver3,
       proxy,
       customDefaults,
       schema: drizzleSchema,
@@ -120433,7 +120619,7 @@ var init_studio2 = __esm({
           return c.json({
             version: "6",
             dialect: dialect7,
-            driver: driver2,
+            driver: driver3,
             schemaFiles,
             customDefaults: preparedDefaults,
             relations: extractRelations(relationsConfig),
@@ -121970,7 +122156,7 @@ var upCommand = new import_commander.Command("up").option("--config <config>", `
 var pullCommand = new import_commander.Command("introspect").option("--config <config>", `Config path [default=drizzle.config.ts]`).option("--out <out>", `Migrations folder`).option("--dialect <dialect>", "Database dialect").option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
   "--introspect-casing <introspectCasing>",
   "Column object keys naming strategy"
-).option("--tablesFilter", `Table name filters`).option("--schemaFilter", `Schema name filters`).option("--url <url>", "Database connection URL").option("--host <host>", "Database host").option("--port <port>", "Database port").option("--user <user>", "Database user").option("--password <password>", "Database password").option("--database <database>", "Database database name").option("--ssl <ssl>", "Database ssl").option("--auth-token <authToken>", "Database auth token [Turso]").option("--driver <driver>", "Driver used for querying the database").action(async (options) => {
+).option("--tablesFilter", `Table name filters`).option("--extensionsFilters", `Table name filters`).option("--schemaFilter", `Schema name filters`).option("--url <url>", "Database connection URL").option("--host <host>", "Database host").option("--port <port>", "Database port").option("--user <user>", "Database user").option("--password <password>", "Database password").option("--database <database>", "Database database name").option("--ssl <ssl>", "Database ssl").option("--auth-token <authToken>", "Database auth token [Turso]").option("--driver <driver>", "Driver used for querying the database").action(async (options) => {
   await printVersions();
   await assertPackages("drizzle-orm");
   await assertOrmCoreVersion();