drizzle-kit 0.30.1-5734f71 → 0.30.1-57eb6bd

package/api.js

@@ -22255,7 +22255,7 @@ var init_sql = __esm({
             const schemaName = chunk[Table2.Symbol.Schema];
             const tableName = chunk[Table2.Symbol.Name];
             return {
-              sql: schemaName === void 0 ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
+              sql: schemaName === void 0 || chunk[Table2.Symbol.IsAlias] ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
               params: []
             };
           }
@@ -25053,23 +25053,20 @@ function relationExtrasToSQL(table5, extras) {
     selection
   };
 }
-function getTableSql(table5) {
-  return sql`${sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(!table5[IsAlias] && table5[Schema])}`}${table5}`;
-}
 function relationToSQL(relation, sourceTable, targetTable, throughTable) {
   if (relation.through) {
     const outerColumnWhere = relation.sourceColumns.map((s, i) => {
       const t = relation.through.source[i];
       return eq(
-        sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
-        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`
+        sql`${sourceTable}.${sql.identifier(s.name)}`,
+        sql`${throughTable}.${sql.identifier(t.name)}`
       );
     });
     const innerColumnWhere = relation.targetColumns.map((s, i) => {
       const t = relation.through.target[i];
       return eq(
-        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`,
-        sql`${getTableSql(targetTable)}.${sql.identifier(s.name)}`
+        sql`${throughTable}.${sql.identifier(t.name)}`,
+        sql`${targetTable}.${sql.identifier(s.name)}`
       );
     });
     return {
@@ -25085,8 +25082,8 @@ function relationToSQL(relation, sourceTable, targetTable, throughTable) {
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
-      sql`${getTableSql(targetTable)}.${sql.identifier(t.name)}`
+      sql`${sourceTable}.${sql.identifier(s.name)}`,
+      sql`${targetTable}.${sql.identifier(t.name)}`
     );
   });
   const fullWhere = and(
@@ -34391,9 +34388,10 @@ var init_query4 = __esm({
     init_entity();
     init_query_promise();
     init_relations();
+    init_sql();
     _a224 = entityKind;
     RelationalQueryBuilder2 = class {
-      constructor(mode, tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session) {
+      constructor(mode, tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session, rowMode) {
         this.mode = mode;
         this.tables = tables;
         this.schema = schema5;
@@ -34402,6 +34400,7 @@ var init_query4 = __esm({
         this.tableConfig = tableConfig;
         this.dialect = dialect6;
         this.session = session;
+        this.rowMode = rowMode;
       }
       findMany(config) {
         return this.mode === "sync" ? new SQLiteSyncRelationalQuery2(
@@ -34413,7 +34412,8 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "many"
+          "many",
+          this.rowMode
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -34423,7 +34423,8 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "many"
+          "many",
+          this.rowMode
         );
       }
       findFirst(config) {
@@ -34436,7 +34437,8 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "first"
+          "first",
+          this.rowMode
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -34446,13 +34448,14 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "first"
+          "first",
+          this.rowMode
         );
       }
     };
     __publicField(RelationalQueryBuilder2, _a224, "SQLiteAsyncRelationalQueryBuilderV2");
     SQLiteRelationalQuery2 = class extends (_b156 = QueryPromise, _a225 = entityKind, _b156) {
-      constructor(tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session, config, mode) {
+      constructor(tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session, config, mode, rowMode) {
         super();
         /** @internal */
         __publicField(this, "mode");
@@ -34465,6 +34468,7 @@ var init_query4 = __esm({
         this.dialect = dialect6;
         this.session = session;
         this.config = config;
+        this.rowMode = rowMode;
         this.mode = mode;
         this.table = table5;
       }
@@ -34489,7 +34493,7 @@ var init_query4 = __esm({
           void 0,
           this.mode === "first" ? "get" : "all",
           (rawRows, mapColumnValue) => {
-            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, true));
+            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, !this.rowMode));
             if (this.mode === "first") {
               return rows[0];
             }
@@ -34501,15 +34505,26 @@ var init_query4 = __esm({
         return this._prepare(false);
       }
       _getQuery() {
-        return this.dialect.buildRelationalQuery({
+        const query = this.dialect.buildRelationalQuery({
           schema: this.schema,
           tableNamesMap: this.tableNamesMap,
           table: this.table,
           tableConfig: this.tableConfig,
           queryConfig: this.config,
           tables: this.tables,
-          mode: this.mode
+          mode: this.mode,
+          isNested: this.rowMode
         });
+        if (this.rowMode) {
+          const jsonColumns = sql.join(
+            query.selection.map((s) => {
+              return sql`${sql.raw(this.dialect.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+            }),
+            sql`, `
+          );
+          query.sql = sql`select json_object(${jsonColumns}) as ${sql.identifier("r")} from (${query.sql}) as ${sql.identifier("t")}`;
+        }
+        return query;
       }
       _toSQL() {
         const query = this._getQuery();
@@ -34592,7 +34607,7 @@ var init_db2 = __esm({
     init_raw2();
     _a228 = entityKind;
     BaseSQLiteDatabase = class {
-      constructor(resultKind, dialect6, session, relations, _schema) {
+      constructor(resultKind, dialect6, session, relations, _schema, rowModeRQB) {
         /** @deprecated */
         __publicField(this, "_query");
         // TO-DO: Figure out how to pass DrizzleTypeError without breaking withReplicas
@@ -34600,6 +34615,7 @@ var init_db2 = __esm({
         this.resultKind = resultKind;
         this.dialect = dialect6;
         this.session = session;
+        this.rowModeRQB = rowModeRQB;
         const rel = relations ?? {};
         this._ = _schema ? {
           schema: _schema.schema,
@@ -34639,7 +34655,8 @@ var init_db2 = __esm({
               relation.table,
               relation,
               dialect6,
-              session
+              session,
+              rowModeRQB
             );
           }
         }
@@ -35105,8 +35122,8 @@ var init_session2 = __esm({
     };
     __publicField(SQLiteSession, _a236, "SQLiteSession");
     SQLiteTransaction = class extends (_b160 = BaseSQLiteDatabase, _a237 = entityKind, _b160) {
-      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0) {
-        super(resultType, dialect6, session, relations, schema5);
+      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0, rowModeRQB) {
+        super(resultType, dialect6, session, relations, schema5, rowModeRQB);
         this.relations = relations;
         this.schema = schema5;
         this.nestedIndex = nestedIndex;
@@ -37885,15 +37902,11 @@ var init_dialect3 = __esm({
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table5, params?.columns);
           for (const column5 of selectedColumns) {
-            columnIdentifiers.push(
-              sql`${table5[column5.tsName]} as ${sql.identifier(column5.tsName)}`
-            );
-            selection.push(
-              {
-                key: column5.tsName,
-                field: column5.column
-              }
-            );
+            columnIdentifiers.push(sql`${column5.column} as ${sql.identifier(column5.tsName)}`);
+            selection.push({
+              key: column5.tsName,
+              field: column5.column
+            });
           }
           return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
         })() : this.unwrapAllColumns(table5, selection));

package/api.mjs

@@ -22260,7 +22260,7 @@ var init_sql = __esm({
             const schemaName = chunk[Table2.Symbol.Schema];
             const tableName = chunk[Table2.Symbol.Name];
             return {
-              sql: schemaName === void 0 ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
+              sql: schemaName === void 0 || chunk[Table2.Symbol.IsAlias] ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
               params: []
             };
           }
@@ -25058,23 +25058,20 @@ function relationExtrasToSQL(table5, extras) {
     selection
   };
 }
-function getTableSql(table5) {
-  return sql`${sql`${sql`${sql.identifier(table5[Schema] ?? "")}.`.if(!table5[IsAlias] && table5[Schema])}`}${table5}`;
-}
 function relationToSQL(relation, sourceTable, targetTable, throughTable) {
   if (relation.through) {
     const outerColumnWhere = relation.sourceColumns.map((s, i) => {
       const t = relation.through.source[i];
       return eq(
-        sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
-        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`
+        sql`${sourceTable}.${sql.identifier(s.name)}`,
+        sql`${throughTable}.${sql.identifier(t.name)}`
       );
     });
     const innerColumnWhere = relation.targetColumns.map((s, i) => {
       const t = relation.through.target[i];
       return eq(
-        sql`${getTableSql(throughTable)}.${sql.identifier(t.name)}`,
-        sql`${getTableSql(targetTable)}.${sql.identifier(s.name)}`
+        sql`${throughTable}.${sql.identifier(t.name)}`,
+        sql`${targetTable}.${sql.identifier(s.name)}`
       );
     });
     return {
@@ -25090,8 +25087,8 @@ function relationToSQL(relation, sourceTable, targetTable, throughTable) {
   const columnWhere = relation.sourceColumns.map((s, i) => {
     const t = relation.targetColumns[i];
     return eq(
-      sql`${getTableSql(sourceTable)}.${sql.identifier(s.name)}`,
-      sql`${getTableSql(targetTable)}.${sql.identifier(t.name)}`
+      sql`${sourceTable}.${sql.identifier(s.name)}`,
+      sql`${targetTable}.${sql.identifier(t.name)}`
     );
   });
   const fullWhere = and(
@@ -34396,9 +34393,10 @@ var init_query4 = __esm({
     init_entity();
     init_query_promise();
     init_relations();
+    init_sql();
     _a224 = entityKind;
     RelationalQueryBuilder2 = class {
-      constructor(mode, tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session) {
+      constructor(mode, tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session, rowMode) {
         this.mode = mode;
         this.tables = tables;
         this.schema = schema5;
@@ -34407,6 +34405,7 @@ var init_query4 = __esm({
         this.tableConfig = tableConfig;
         this.dialect = dialect6;
         this.session = session;
+        this.rowMode = rowMode;
       }
       findMany(config) {
         return this.mode === "sync" ? new SQLiteSyncRelationalQuery2(
@@ -34418,7 +34417,8 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "many"
+          "many",
+          this.rowMode
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -34428,7 +34428,8 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "many"
+          "many",
+          this.rowMode
         );
       }
       findFirst(config) {
@@ -34441,7 +34442,8 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "first"
+          "first",
+          this.rowMode
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -34451,13 +34453,14 @@ var init_query4 = __esm({
           this.dialect,
           this.session,
           config ?? true,
-          "first"
+          "first",
+          this.rowMode
         );
       }
     };
     __publicField(RelationalQueryBuilder2, _a224, "SQLiteAsyncRelationalQueryBuilderV2");
     SQLiteRelationalQuery2 = class extends (_b156 = QueryPromise, _a225 = entityKind, _b156) {
-      constructor(tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session, config, mode) {
+      constructor(tables, schema5, tableNamesMap, table5, tableConfig, dialect6, session, config, mode, rowMode) {
         super();
         /** @internal */
         __publicField(this, "mode");
@@ -34470,6 +34473,7 @@ var init_query4 = __esm({
         this.dialect = dialect6;
         this.session = session;
         this.config = config;
+        this.rowMode = rowMode;
         this.mode = mode;
         this.table = table5;
       }
@@ -34494,7 +34498,7 @@ var init_query4 = __esm({
           void 0,
           this.mode === "first" ? "get" : "all",
           (rawRows, mapColumnValue) => {
-            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, true));
+            const rows = rawRows.map((row) => mapRelationalRow(row, query.selection, mapColumnValue, !this.rowMode));
             if (this.mode === "first") {
               return rows[0];
             }
@@ -34506,15 +34510,26 @@ var init_query4 = __esm({
         return this._prepare(false);
       }
       _getQuery() {
-        return this.dialect.buildRelationalQuery({
+        const query = this.dialect.buildRelationalQuery({
           schema: this.schema,
           tableNamesMap: this.tableNamesMap,
           table: this.table,
           tableConfig: this.tableConfig,
           queryConfig: this.config,
           tables: this.tables,
-          mode: this.mode
+          mode: this.mode,
+          isNested: this.rowMode
         });
+        if (this.rowMode) {
+          const jsonColumns = sql.join(
+            query.selection.map((s) => {
+              return sql`${sql.raw(this.dialect.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+            }),
+            sql`, `
+          );
+          query.sql = sql`select json_object(${jsonColumns}) as ${sql.identifier("r")} from (${query.sql}) as ${sql.identifier("t")}`;
+        }
+        return query;
       }
       _toSQL() {
         const query = this._getQuery();
@@ -34597,7 +34612,7 @@ var init_db2 = __esm({
     init_raw2();
     _a228 = entityKind;
     BaseSQLiteDatabase = class {
-      constructor(resultKind, dialect6, session, relations, _schema) {
+      constructor(resultKind, dialect6, session, relations, _schema, rowModeRQB) {
         /** @deprecated */
         __publicField(this, "_query");
         // TO-DO: Figure out how to pass DrizzleTypeError without breaking withReplicas
@@ -34605,6 +34620,7 @@ var init_db2 = __esm({
         this.resultKind = resultKind;
         this.dialect = dialect6;
         this.session = session;
+        this.rowModeRQB = rowModeRQB;
         const rel = relations ?? {};
         this._ = _schema ? {
           schema: _schema.schema,
@@ -34644,7 +34660,8 @@ var init_db2 = __esm({
               relation.table,
               relation,
               dialect6,
-              session
+              session,
+              rowModeRQB
             );
           }
         }
@@ -35110,8 +35127,8 @@ var init_session2 = __esm({
     };
     __publicField(SQLiteSession, _a236, "SQLiteSession");
     SQLiteTransaction = class extends (_b160 = BaseSQLiteDatabase, _a237 = entityKind, _b160) {
-      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0) {
-        super(resultType, dialect6, session, relations, schema5);
+      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0, rowModeRQB) {
+        super(resultType, dialect6, session, relations, schema5, rowModeRQB);
         this.relations = relations;
         this.schema = schema5;
         this.nestedIndex = nestedIndex;
@@ -37890,15 +37907,11 @@ var init_dialect3 = __esm({
           const columnIdentifiers = [];
           const selectedColumns = this.getSelectedTableColumns(table5, params?.columns);
           for (const column5 of selectedColumns) {
-            columnIdentifiers.push(
-              sql`${table5[column5.tsName]} as ${sql.identifier(column5.tsName)}`
-            );
-            selection.push(
-              {
-                key: column5.tsName,
-                field: column5.column
-              }
-            );
+            columnIdentifiers.push(sql`${column5.column} as ${sql.identifier(column5.tsName)}`);
+            selection.push({
+              key: column5.tsName,
+              field: column5.column
+            });
           }
           return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
         })() : this.unwrapAllColumns(table5, selection));

package/bin.cjs

@@ -92611,7 +92611,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.1-5734f71";
+  const envVersion = "0.30.1-57eb6bd";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.1-5734f71",
+	"version": "0.30.1-57eb6bd",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",