drizzle-kit 0.16.1 → 0.16.3

package/index.js

@@ -11819,31 +11819,31 @@ var require_node2 = __commonJS({
         var configAbsolutePath = walkForTsConfig(cwd);
         return configAbsolutePath ? path5.resolve(configAbsolutePath) : void 0;
       }
-      function walkForTsConfig(directory, existsSync2) {
-        if (existsSync2 === void 0) {
-          existsSync2 = fs32.existsSync;
+      function walkForTsConfig(directory, existsSync3) {
+        if (existsSync3 === void 0) {
+          existsSync3 = fs32.existsSync;
         }
         var configPath = path5.join(directory, "./tsconfig.json");
-        if (existsSync2(configPath)) {
+        if (existsSync3(configPath)) {
           return configPath;
         }
         var parentDirectory = path5.join(directory, "../");
         if (directory === parentDirectory) {
           return void 0;
         }
-        return walkForTsConfig(parentDirectory, existsSync2);
+        return walkForTsConfig(parentDirectory, existsSync3);
       }
       exports2.walkForTsConfig = walkForTsConfig;
-      function loadTsconfig(configFilePath, existsSync2, readFileSync2) {
-        if (existsSync2 === void 0) {
-          existsSync2 = fs32.existsSync;
+      function loadTsconfig(configFilePath, existsSync3, readFileSync2) {
+        if (existsSync3 === void 0) {
+          existsSync3 = fs32.existsSync;
         }
         if (readFileSync2 === void 0) {
           readFileSync2 = function(filename) {
             return fs32.readFileSync(filename, "utf8");
           };
         }
-        if (!existsSync2(configFilePath)) {
+        if (!existsSync3(configFilePath)) {
           return void 0;
         }
         var configString = readFileSync2(configFilePath);
@@ -11856,10 +11856,10 @@ var require_node2 = __commonJS({
           }
           var currentDir = path5.dirname(configFilePath);
           var extendedConfigPath = path5.join(currentDir, extendedConfig);
-          if (extendedConfig.indexOf("/") !== -1 && extendedConfig.indexOf(".") !== -1 && !existsSync2(extendedConfigPath)) {
+          if (extendedConfig.indexOf("/") !== -1 && extendedConfig.indexOf(".") !== -1 && !existsSync3(extendedConfigPath)) {
             extendedConfigPath = path5.join(currentDir, "node_modules", extendedConfig);
           }
-          var base = loadTsconfig(extendedConfigPath, existsSync2, readFileSync2) || {};
+          var base = loadTsconfig(extendedConfigPath, existsSync3, readFileSync2) || {};
           if (base.compilerOptions && base.compilerOptions.baseUrl) {
             var extendsDir = path5.dirname(extendedConfig);
             base.compilerOptions.baseUrl = path5.join(extendsDir, base.compilerOptions.baseUrl);
@@ -13863,10 +13863,10 @@ var init_sqlgenerator = __esm({
       convert(statement) {
         const newFk = PgSquasher.unsquashFK(statement.data);
         const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
-        let sql = `ALTER TABLE ${oldFk.tableFrom} DROP FOREIGN KEY ${oldFk.name};
+        let sql = `ALTER TABLE ${oldFk.tableFrom} DROP CONSTRAINT ${oldFk.name};
 `;
-        const onDeleteStatement = newFk.onDelete || "";
-        const onUpdateStatement = newFk.onUpdate || "";
+        const onDeleteStatement = newFk.onDelete ? `ON DELETE ${newFk.onDelete}` : "";
+        const onUpdateStatement = newFk.onUpdate ? `ON UPDATE ${newFk.onDelete}` : "";
         const fromColumnsString = newFk.columnsFrom.map((it) => `"${it}"`).join(",");
         const toColumnsString = newFk.columnsTo.map((it) => `"${it}"`).join(",");
         const alterStatement = `ALTER TABLE ${newFk.tableFrom} ADD CONSTRAINT ${newFk.name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${newFk.tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
@@ -20585,7 +20585,7 @@ var init_jsonStatements = __esm({
       });
     };
     prepareAlterTableColumnsJson = (tableName, deleted, added, altered, addedFk, dialect6) => {
-      const statements = [];
+      const addColumns = [];
       const dropColumns = _prepareDropColumns(tableName, deleted);
       const alterColumns = _prepareAlterColumns(tableName, altered);
       if (dialect6 === "sqlite") {
@@ -20595,14 +20595,12 @@ var init_jsonStatements = __esm({
           added,
           jsonCreateFKStatements
         );
-        statements.push(...sqliteAddColumns);
+        addColumns.push(...sqliteAddColumns);
       } else {
-        const addColumns = _prepareAddColumns(tableName, added);
-        statements.push(...addColumns);
+        const addColumns2 = _prepareAddColumns(tableName, added);
+        addColumns2.push(...addColumns2);
       }
-      statements.push(...dropColumns);
-      statements.push(...alterColumns);
-      return statements;
+      return { addColumns, dropColumns, alterColumns };
     };
     _prepareDropColumns = (taleName, columns) => {
       return columns.map((it) => {
@@ -21020,7 +21018,7 @@ var init_snapshotsDiffer = __esm({
         jsonDeletedCompositePKs.push(...deletedCompositePKs);
         jsonAlteredCompositePKs.push(...alteredCompositePKs);
       });
-      const jsonAlterTables = allAlteredResolved.map((it) => {
+      const jsonTableAlternations = allAlteredResolved.map((it) => {
         return prepareAlterTableColumnsJson(
           it.name,
           it.deleted,
@@ -21029,7 +21027,12 @@ var init_snapshotsDiffer = __esm({
           it.addedForeignKeys,
           dialect6
         );
-      }).flat();
+      }).flat().reduce((res, it) => {
+        res.createColumns.push(...it.addColumns);
+        res.dropColumns.push(...it.dropColumns);
+        res.alterColumns.push(...it.alterColumns);
+        return res;
+      }, { createColumns: [], dropColumns: [], alterColumns: [] });
       const jsonCreateIndexesForAllAlteredTables = allAltered.map((it) => {
         return prepareCreateIndexesJson(it.name, it.addedIndexes || {});
       }).flat();
@@ -21091,15 +21094,17 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
-      jsonStatements.push(...jsonAlterTables);
+      jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonAlterReferencesForAlteredTables);
+      jsonStatements.push(...jsonTableAlternations.dropColumns);
+      jsonStatements.push(...jsonTableAlternations.createColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
-      jsonStatements.push(...jsonAlterReferencesForAlteredTables);
+      jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
-      jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
-      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonDeletedCompositePKs);
+      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...filteredJsonSetNewTableSchemas);
@@ -26377,7 +26382,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.16.1",
+  version: "0.16.3",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Alex Blokh <aleksandrblokh@gmail.com>",
   license: "MIT",
@@ -26739,6 +26744,19 @@ var printVersions = () => {
   console.log(`${source_default.gray(versions())}
 `);
 };
+var assertEitherConfigOrOut = (config, out) => {
+  if (out)
+    return out;
+  if (!(0, import_fs8.existsSync)(import_path6.default.join(import_path6.default.resolve(config)))) {
+    console.log(`${config} file does not exist`);
+    process.exit(1);
+  }
+  console.log(`Reading ${config}`);
+  const drizzleConfig = JSON.parse(
+    import_fs8.default.readFileSync(import_path6.default.join(import_path6.default.resolve(config))).toString()
+  );
+  return drizzleConfig.out;
+};
 var versions = () => {
   const { npmVersion } = pgVersions();
   const ormVersion = npmVersion ? `
@@ -26815,11 +26833,13 @@ var prepareGenerateConfig = (options) => {
   return configSchema.parse({ schema: schema4, out });
 };
 var checkSchema = objectType({
-  out: stringType().default("drizzle")
+  out: stringType().optional(),
+  config: stringType().default("drizzle.config.json")
 }).strict();
-var checkPgCommand = new Command("check:pg").option("--out <out>", `Output folder, 'drizzle' by default`).action((options) => {
+var checkPgCommand = new Command("check:pg").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
   printVersions();
-  const { out } = checkSchema.parse(options);
+  const params = checkSchema.parse(options);
+  const out = assertEitherConfigOrOut(params.config, params.out);
   if (!out) {
     console.log(error(`'out' folder param must be set`));
     process.exit(0);
@@ -26827,9 +26847,10 @@ var checkPgCommand = new Command("check:pg").option("--out <out>", `Output folde
   checkHandler(out, "pg");
   console.log("Everything's fine \u{1F436}\u{1F525}");
 });
-var checkSqliteCommand = new Command("check:sqlite").option("--out <out>", `Output folder, 'drizzle' by default`).action((options) => {
+var checkSqliteCommand = new Command("check:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
   printVersions();
-  const { out } = checkSchema.parse(options);
+  const params = checkSchema.parse(options);
+  const out = assertEitherConfigOrOut(params.config, params.out);
   if (!out) {
     console.log(error(`'out' folder param must be set`));
     process.exit(0);
@@ -26837,28 +26858,43 @@ var checkSqliteCommand = new Command("check:sqlite").option("--out <out>", `Outp
   checkHandler(out, "sqlite");
   console.log("Everything's fine \u{1F436}\u{1F525}");
 });
-var upPgCommand = new Command("up:pg").option("--out <out>", `Output folder, 'drizzle' by default`).action((options) => {
+var upPgCommand = new Command("up:pg").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
   printVersions();
-  const { out } = checkSchema.parse(options);
+  const params = checkSchema.parse(options);
+  const out = assertEitherConfigOrOut(params.config, params.out);
   if (!out) {
-    console.log(error(`'out' folder param must be set`));
+    console.log(
+      error(
+        `'out' folder param must be set through '--out' param or in config file`
+      )
+    );
     process.exit(0);
   }
   assertPackages("drizzle-orm", "drizzle-orm-pg");
   upPgHandler(out);
 });
-var upMysqlCommand = new Command("up:mysql").option("--out <out>", `Output folder, 'drizzle' by default`).action((options) => {
+var upMysqlCommand = new Command("up:mysql").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
   printVersions();
-  const { out } = checkSchema.parse(options);
+  const params = checkSchema.parse(options);
+  const out = assertEitherConfigOrOut(params.config, params.out);
+  if (!out) {
+    console.log(
+      error(
+        `'out' folder param must be set through '--out' param or in config file`
+      )
+    );
+    process.exit(0);
+  }
   if (!out) {
     console.log(error(`'out' folder param must be set`));
     process.exit(0);
   }
   upMysqlHandler(out);
 });
-var upSqliteCommand = new Command("up:sqlite").option("--out <out>", `Output folder, 'drizzle' by default`).action((options) => {
+var upSqliteCommand = new Command("up:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
   printVersions();
-  const { out } = checkSchema.parse(options);
+  const params = checkSchema.parse(options);
+  const out = assertEitherConfigOrOut(params.config, params.out);
   if (!out) {
     console.log(error(`'out' folder param must be set`));
     process.exit(0);

package/package.json

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

package/readme.md

@@ -61,49 +61,70 @@ $ npm exec drizzle-kit generate --out migrations-folder --dialect pg --schema sr
 Or put your file to `drizzle.config.json` configuration file:
 ```json
 {
-  "dialect": "pg",
   "out": "./migrations-folder",
   "schema": "./src/db"
 }
 ```
 ---
-### List of commands
-**`$ drizzle-kit generate`** - generates SQL migrations based on .ts schema\
-`--config` [optional defalut=drizzle.config.json] path to an optional config file\
-`--dialect` [optional default=pg] database dialect, one of -> pg, mysql, sqlite\
-`--schema` path to a schema file or folder with multiple schema files\
-`--out` [optional default=drizzle/] place where to store migration files\
+## List of commands
+
+### Generate SQL migrations based on current .ts schema\
+**`$ drizzle-kit generate:pg`** \
+**`$ drizzle-kit generate:mysql`** \
+**`$ drizzle-kit generate:sqlite`** \
+
+`--config` [optional defalut=drizzle.config.json] config file path\
+`--schema` path to typescript schema file or folder with multiple schema files\
+`--out` [optional default=drizzle/] migrations folder
 ```shell
-$ drizzle-kit generate 
+$ drizzle-kit generate:pg 
 ## runs generate command with drizzle.config.json 
 
-$ drizzle-kit generate --config custom.config.json
+$ drizzle-kit generate:pg --config=./custom.config.json
 ## runs generate command with custom.config.json 
 
-$ drizzle-kit generate --dialect pg --schema src/schema.ts
+$ drizzle-kit generate:pg --schema=./src/schema.ts
 ## runs generate command and outputs results to ./drizzle
 
-$ drizzle-kit generate --dialect .. --schema .. --out ./migration-folder
-## runs generate command and outputs results to ./migration-folder
+$ drizzle-kit generate:pg --schema=./src/schema.ts --out=./migrations/
+## runs generate command and outputs results to ./migration
 ```  
 
-
-**`$ drizzle-kit introspect:pg`** - generate `schema.ts` file from existing PG database within seconds
+### Introspect existing database and generate typescript schema
+**`$ drizzle-kit introspect:pg`**
 ```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\
-`--schema` path to a schema file or folder with multiple schema files\
+### Update stale snapshots
+**`$ drizzle-kit up:pg`** \
+**`$ drizzle-kit up:mysql`**\
+**`$ drizzle-kit up:sqlite`**
 
-**`$ drizzle-kit check`** - checks for collisions
-`--config` [optional defalut=drizzle.config.json] path to an optional config file\
-`--dialect` [optional default=pg] database dialect, one of -> pg, mysql, sqlite\
-`--schema` path to a schema file or folder with multiple schema files\
+`--out` [optional] migrations folder\
+`--config` [optional defalut=drizzle.config.json] config file path
+```shell
+## migrations folder is taken from drizzle.config.json
+drizzle-kit up:pg
+
+drizzle-kit up:pg --out=migrations/ 
+```
+
+### Migrations collisions check
+**`$ drizzle-kit check:pg`**\
+**`$ drizzle-kit check:mysql`**\
+**`$ drizzle-kit check:sqlite`**
+
+`--out` [optional] migration folder\
+`--config` [optional defalut=drizzle.config.json] config file path
+```shell
+## migrations folder is taken from drizzle.config.json
+drizzle-kit check:pg
+
+drizzle-kit check:pg --out=migrations/ 
+```