drizzle-kit 0.22.7-7d5e8a9 → 0.22.7-a16c9a1

package/bin.cjs

@@ -22391,19 +22391,13 @@ function mapSqlToSqliteType(sqlType) {
 }
 function extractGeneratedColumns(input) {
   const columns = {};
-  const lines = input.split(/,\s*(?![^()]*\))/);
+  const lines = input.split("\n");
   for (const line of lines) {
     if (line.includes("GENERATED ALWAYS AS")) {
       const parts = line.trim().split(/\s+/);
-      const columnName = parts[0].replace(/[`'"]/g, "");
+      const columnName = parts[0].slice(1, parts[0].length - 1);
       const expression = line.substring(line.indexOf("("), line.indexOf(")") + 1).trim();
-      const typeIndex = parts.findIndex(
-        (part) => part.match(/(stored|virtual)/i)
-      );
-      let type = "virtual";
-      if (typeIndex !== -1) {
-        type = parts[typeIndex].replace(/[^a-z]/gi, "").toLowerCase();
-      }
+      const type = parts[parts.length - 1].replace(/(^,)|(,$)/g, "").toLowerCase();
       columns[columnName] = {
         columnName,
         expression,
@@ -22451,7 +22445,7 @@ var init_sqliteSerializer = __esm({
             notNull,
             autoincrement: (0, import_drizzle_orm7.is)(column7, import_sqlite_core2.SQLiteBaseInteger) ? column7.autoIncrement : false,
             generated: generated ? {
-              as: (0, import_drizzle_orm7.is)(generated.as, import_drizzle_orm7.SQL) ? `(${dialect6.sqlToQuery(generated.as, "indexes").sql})` : typeof generated.as === "function" ? `(${dialect6.sqlToQuery(generated.as(), "indexes").sql})` : `(${generated.as})`,
+              as: (0, import_drizzle_orm7.is)(generated.as, import_drizzle_orm7.SQL) ? dialect6.sqlToQuery(generated.as, "indexes").sql : typeof generated.as === "function" ? dialect6.sqlToQuery(generated.as(), "indexes").sql : generated.as,
               type: generated.mode ?? "virtual"
             } : void 0
           };
@@ -23208,7 +23202,7 @@ var init_sqlgenerator = __esm({
           const notNullStatement = column7.notNull ? " NOT NULL" : "";
           const defaultStatement = column7.default !== void 0 ? ` DEFAULT ${column7.default}` : "";
           const autoincrementStatement = column7.autoincrement ? " AUTOINCREMENT" : "";
-          const generatedStatement = column7.generated ? ` GENERATED ALWAYS AS ${column7.generated.as} ${column7.generated.type.toUpperCase()}` : "";
+          const generatedStatement = column7.generated ? ` GENERATED ALWAYS AS (${column7.generated.as}) ${column7.generated.type.toUpperCase()}` : "";
           statement += "	";
           statement += `\`${column7.name}\` ${column7.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${generatedStatement}`;
           statement += i2 === columns.length - 1 ? "" : ",\n";
@@ -23639,7 +23633,7 @@ var init_sqlgenerator = __esm({
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        const generatedStatement = generated ? ` GENERATED ALWAYS AS ${generated.as} ${generated.type.toUpperCase()}` : "";
+        const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated.as}) ${generated.type.toUpperCase()}` : "";
         return `ALTER TABLE \`${tableName}\` ADD \`${name}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generatedStatement}${referenceStatement};`;
       }
     };
@@ -122363,14 +122357,14 @@ var init_sqlitePushUtils = __esm({
               }
               tablesContext[newTableName] = _moveDataStatements(
                 statement.tableName,
-                json1,
+                json2,
                 true
               );
             } else {
               if (typeof tablesContext[newTableName] === "undefined") {
                 tablesContext[newTableName] = _moveDataStatements(
                   statement.tableName,
-                  json1
+                  json2
                 );
               }
             }
@@ -122389,7 +122383,7 @@ var init_sqlitePushUtils = __esm({
             const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
             for (const table4 of uniqueTableRefs) {
               if (typeof tablesContext[table4] === "undefined") {
-                tablesContext[table4] = [..._moveDataStatements(table4, json1)];
+                tablesContext[table4] = [..._moveDataStatements(table4, json2)];
               }
             }
           }
@@ -122410,9 +122404,9 @@ var init_sqlitePushUtils = __esm({
             );
           }
         } else {
-          const stmnt = fromJson([statement], "sqlite");
+          const stmnt = fromJson([statement], "sqlite")[0];
           if (typeof stmnt !== "undefined") {
-            statementsToExecute.push(...stmnt);
+            statementsToExecute.push(stmnt);
           }
         }
       }
@@ -124242,24 +124236,25 @@ var init_push = __esm({
             process.exit(0);
           }
         }
+        if (!("driver" in credentials2)) {
+          await db2.query("begin");
+          try {
+            for (const dStmnt of statementsToExecute) {
+              await db2.query(dStmnt);
+            }
+            await db2.query("commit");
+          } catch (e2) {
+            await db2.query("rollback");
+          }
+        } else if (credentials2.driver === "turso") {
+          await db2.batch(statementsToExecute.map((it) => ({ query: it })));
+        }
         if (statementsToExecute.length === 0) {
           (0, import_hanji11.render)(`
 [${source_default.blue("i")}] No changes detected`);
         } else {
-          if (!("driver" in credentials2)) {
-            await db2.query("begin");
-            try {
-              for (const dStmnt of statementsToExecute) {
-                await db2.query(dStmnt);
-              }
-              await db2.query("commit");
-            } catch (e2) {
-              console.error(e2);
-              await db2.query("rollback");
-              process.exit(1);
-            }
-          } else if (credentials2.driver === "turso") {
-            await db2.batch(statementsToExecute.map((it) => ({ query: it })));
+          for (const dStmnt of statementsToExecute) {
+            await db2.run(dStmnt);
           }
           (0, import_hanji11.render)(`[${source_default.green("\u2713")}] Changes applied`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.22.7-7d5e8a9",
+  "version": "0.22.7-a16c9a1",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -24156,7 +24156,7 @@ var init_sqlgenerator = __esm({
           const notNullStatement = column4.notNull ? " NOT NULL" : "";
           const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
           const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
-          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS ${column4.generated.as} ${column4.generated.type.toUpperCase()}` : "";
+          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS (${column4.generated.as}) ${column4.generated.type.toUpperCase()}` : "";
           statement += "	";
           statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${generatedStatement}`;
           statement += i === columns.length - 1 ? "" : ",\n";
@@ -24587,7 +24587,7 @@ var init_sqlgenerator = __esm({
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        const generatedStatement = generated ? ` GENERATED ALWAYS AS ${generated.as} ${generated.type.toUpperCase()}` : "";
+        const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated.as}) ${generated.type.toUpperCase()}` : "";
         return `ALTER TABLE \`${tableName}\` ADD \`${name2}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generatedStatement}${referenceStatement};`;
       }
     };
@@ -29070,19 +29070,13 @@ function mapSqlToSqliteType(sqlType) {
 }
 function extractGeneratedColumns(input) {
   const columns = {};
-  const lines = input.split(/,\s*(?![^()]*\))/);
+  const lines = input.split("\n");
   for (const line of lines) {
     if (line.includes("GENERATED ALWAYS AS")) {
       const parts = line.trim().split(/\s+/);
-      const columnName = parts[0].replace(/[`'"]/g, "");
+      const columnName = parts[0].slice(1, parts[0].length - 1);
       const expression = line.substring(line.indexOf("("), line.indexOf(")") + 1).trim();
-      const typeIndex = parts.findIndex(
-        (part) => part.match(/(stored|virtual)/i)
-      );
-      let type = "virtual";
-      if (typeIndex !== -1) {
-        type = parts[typeIndex].replace(/[^a-z]/gi, "").toLowerCase();
-      }
+      const type = parts[parts.length - 1].replace(/(^,)|(,$)/g, "").toLowerCase();
       columns[columnName] = {
         columnName,
         expression,
@@ -29130,7 +29124,7 @@ var init_sqliteSerializer = __esm({
             notNull,
             autoincrement: is(column4, SQLiteBaseInteger) ? column4.autoIncrement : false,
             generated: generated ? {
-              as: is(generated.as, SQL) ? `(${dialect5.sqlToQuery(generated.as, "indexes").sql})` : typeof generated.as === "function" ? `(${dialect5.sqlToQuery(generated.as(), "indexes").sql})` : `(${generated.as})`,
+              as: is(generated.as, SQL) ? dialect5.sqlToQuery(generated.as, "indexes").sql : typeof generated.as === "function" ? dialect5.sqlToQuery(generated.as(), "indexes").sql : generated.as,
               type: generated.mode ?? "virtual"
             } : void 0
           };
@@ -35054,14 +35048,14 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
           }
           tablesContext[newTableName] = _moveDataStatements(
             statement.tableName,
-            json1,
+            json2,
             true
           );
         } else {
           if (typeof tablesContext[newTableName] === "undefined") {
             tablesContext[newTableName] = _moveDataStatements(
               statement.tableName,
-              json1
+              json2
             );
           }
         }
@@ -35080,7 +35074,7 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
         for (const table4 of uniqueTableRefs) {
           if (typeof tablesContext[table4] === "undefined") {
-            tablesContext[table4] = [..._moveDataStatements(table4, json1)];
+            tablesContext[table4] = [..._moveDataStatements(table4, json2)];
           }
         }
       }
@@ -35101,9 +35095,9 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         );
       }
     } else {
-      const stmnt = fromJson([statement], "sqlite");
+      const stmnt = fromJson([statement], "sqlite")[0];
       if (typeof stmnt !== "undefined") {
-        statementsToExecute.push(...stmnt);
+        statementsToExecute.push(stmnt);
       }
     }
   }

package/payload.mjs

@@ -24161,7 +24161,7 @@ var init_sqlgenerator = __esm({
           const notNullStatement = column4.notNull ? " NOT NULL" : "";
           const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
           const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
-          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS ${column4.generated.as} ${column4.generated.type.toUpperCase()}` : "";
+          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS (${column4.generated.as}) ${column4.generated.type.toUpperCase()}` : "";
           statement += "	";
           statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${generatedStatement}`;
           statement += i === columns.length - 1 ? "" : ",\n";
@@ -24592,7 +24592,7 @@ var init_sqlgenerator = __esm({
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        const generatedStatement = generated ? ` GENERATED ALWAYS AS ${generated.as} ${generated.type.toUpperCase()}` : "";
+        const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated.as}) ${generated.type.toUpperCase()}` : "";
         return `ALTER TABLE \`${tableName}\` ADD \`${name2}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generatedStatement}${referenceStatement};`;
       }
     };
@@ -29075,19 +29075,13 @@ function mapSqlToSqliteType(sqlType) {
 }
 function extractGeneratedColumns(input) {
   const columns = {};
-  const lines = input.split(/,\s*(?![^()]*\))/);
+  const lines = input.split("\n");
   for (const line of lines) {
     if (line.includes("GENERATED ALWAYS AS")) {
       const parts = line.trim().split(/\s+/);
-      const columnName = parts[0].replace(/[`'"]/g, "");
+      const columnName = parts[0].slice(1, parts[0].length - 1);
       const expression = line.substring(line.indexOf("("), line.indexOf(")") + 1).trim();
-      const typeIndex = parts.findIndex(
-        (part) => part.match(/(stored|virtual)/i)
-      );
-      let type = "virtual";
-      if (typeIndex !== -1) {
-        type = parts[typeIndex].replace(/[^a-z]/gi, "").toLowerCase();
-      }
+      const type = parts[parts.length - 1].replace(/(^,)|(,$)/g, "").toLowerCase();
       columns[columnName] = {
         columnName,
         expression,
@@ -29135,7 +29129,7 @@ var init_sqliteSerializer = __esm({
             notNull,
             autoincrement: is(column4, SQLiteBaseInteger) ? column4.autoIncrement : false,
             generated: generated ? {
-              as: is(generated.as, SQL) ? `(${dialect5.sqlToQuery(generated.as, "indexes").sql})` : typeof generated.as === "function" ? `(${dialect5.sqlToQuery(generated.as(), "indexes").sql})` : `(${generated.as})`,
+              as: is(generated.as, SQL) ? dialect5.sqlToQuery(generated.as, "indexes").sql : typeof generated.as === "function" ? dialect5.sqlToQuery(generated.as(), "indexes").sql : generated.as,
               type: generated.mode ?? "virtual"
             } : void 0
           };
@@ -35045,14 +35039,14 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
           }
           tablesContext[newTableName] = _moveDataStatements(
             statement.tableName,
-            json1,
+            json2,
             true
           );
         } else {
           if (typeof tablesContext[newTableName] === "undefined") {
             tablesContext[newTableName] = _moveDataStatements(
               statement.tableName,
-              json1
+              json2
             );
           }
         }
@@ -35071,7 +35065,7 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
         for (const table4 of uniqueTableRefs) {
           if (typeof tablesContext[table4] === "undefined") {
-            tablesContext[table4] = [..._moveDataStatements(table4, json1)];
+            tablesContext[table4] = [..._moveDataStatements(table4, json2)];
           }
         }
       }
@@ -35092,9 +35086,9 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         );
       }
     } else {
-      const stmnt = fromJson([statement], "sqlite");
+      const stmnt = fromJson([statement], "sqlite")[0];
       if (typeof stmnt !== "undefined") {
-        statementsToExecute.push(...stmnt);
+        statementsToExecute.push(stmnt);
       }
     }
   }