drizzle-kit 1.0.0-beta.1-e30ede4 → 1.0.0-beta.1-af4c434

package/api.js

@@ -23703,8 +23703,6 @@ var init_relations = __esm({
         this.tables = tables;
         this.config = config;
         for (const [tsName, table6] of Object.entries(tables)) {
-          if (config[tsName]?.$drizzleTypeError)
-            continue;
           const isTable2 = is(table6, Table2);
           const isView2 = is(table6, View3);
           if (!(isTable2 || isView2))
@@ -23811,14 +23809,14 @@ var init_relations = __esm({
               );
               if (reverseRelations.length > 1) {
                 throw new Error(
-                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${getTableUniqueName(relation.sourceTable)}" were found.
+                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${this.tableNamesMap[getTableUniqueName(relation.sourceTable)] ?? getTableUniqueName(relation.sourceTable)}" were found.
 Hint: you can specify "alias" on both sides of the relation with the same value`
                 );
               }
               reverseRelation = reverseRelations[0];
               if (!reverseRelation) {
                 throw new Error(
-                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${getTableUniqueName(relation.sourceTable)}" was found`
+                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${this.tableNamesMap[getTableUniqueName(relation.sourceTable)] ?? getTableUniqueName(relation.sourceTable)}" was found`
                 );
               }
             }
@@ -33531,7 +33529,8 @@ var init_dialect2 = __esm({
         isNested,
         errorPath,
         depth,
-        throughJoin
+        throughJoin,
+        jsonb: jsonb2
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -33584,7 +33583,8 @@ var init_dialect2 = __esm({
                 isNested: true,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
                 depth: currentDepth + 1,
-                throughJoin: throughJoin2
+                throughJoin: throughJoin2,
+                jsonb: jsonb2
               });
               selection.push({
                 field: targetTable,
@@ -33595,12 +33595,12 @@ var init_dialect2 = __esm({
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => {
-                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`${jsonb2}(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
                 }),
                 sql`, `
               );
-              const json4 = isNested ? sql`jsonb` : sql`json`;
-              const joinQuery = isSingle2 ? sql`(select ${json4}_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${json4}_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              const json4 = isNested ? jsonb2 : sql`json`;
+              const joinQuery = isSingle2 ? sql`(select ${json4}_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${json4}_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), ${jsonb2}_array()) as ${sql.identifier(k)}`;
               return joinQuery;
             }),
             sql`, `
@@ -35001,7 +35001,7 @@ var init_query4 = __esm({
     init_sql();
     _a225 = entityKind;
     RelationalQueryBuilder2 = class {
-      constructor(mode, tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, rowMode) {
+      constructor(mode, tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, rowMode, forbidJsonb) {
         this.mode = mode;
         this.tables = tables;
         this.schema = schema5;
@@ -35011,6 +35011,7 @@ var init_query4 = __esm({
         this.dialect = dialect6;
         this.session = session;
         this.rowMode = rowMode;
+        this.forbidJsonb = forbidJsonb;
       }
       findMany(config) {
         return this.mode === "sync" ? new SQLiteSyncRelationalQuery2(
@@ -35023,7 +35024,8 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "many",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -35034,7 +35036,8 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "many",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         );
       }
       findFirst(config) {
@@ -35048,7 +35051,8 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "first",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -35059,13 +35063,14 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "first",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         );
       }
     };
     __publicField(RelationalQueryBuilder2, _a225, "SQLiteAsyncRelationalQueryBuilderV2");
     SQLiteRelationalQuery2 = class extends (_b156 = QueryPromise, _a226 = entityKind, _b156) {
-      constructor(tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, config, mode, rowMode) {
+      constructor(tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, config, mode, rowMode, forbidJsonb) {
         super();
         /** @internal */
         __publicField(this, "mode");
@@ -35079,6 +35084,7 @@ var init_query4 = __esm({
         this.session = session;
         this.config = config;
         this.rowMode = rowMode;
+        this.forbidJsonb = forbidJsonb;
         this.mode = mode;
         this.table = table6;
       }
@@ -35091,7 +35097,8 @@ var init_query4 = __esm({
           tableConfig: this.tableConfig,
           queryConfig: this.config,
           tables: this.tables,
-          mode: this.mode
+          mode: this.mode,
+          jsonb: this.forbidJsonb ? sql`json` : sql`jsonb`
         });
         return query.sql;
       }
@@ -35115,6 +35122,7 @@ var init_query4 = __esm({
         return this._prepare(false);
       }
       _getQuery() {
+        const jsonb2 = this.forbidJsonb ? sql`json` : sql`jsonb`;
         const query = this.dialect.buildRelationalQuery({
           schema: this.schema,
           tableNamesMap: this.tableNamesMap,
@@ -35123,12 +35131,13 @@ var init_query4 = __esm({
           queryConfig: this.config,
           tables: this.tables,
           mode: this.mode,
-          isNested: this.rowMode
+          isNested: this.rowMode,
+          jsonb: jsonb2
         });
         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)}`;
+              return sql`${sql.raw(this.dialect.escapeString(s.key))}, ${s.selection ? sql`${jsonb2}(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
             }),
             sql`, `
           );
@@ -35217,7 +35226,7 @@ var init_db2 = __esm({
     init_raw2();
     _a229 = entityKind;
     BaseSQLiteDatabase = class {
-      constructor(resultKind, dialect6, session, relations, _schema, rowModeRQB) {
+      constructor(resultKind, dialect6, session, relations, _schema, rowModeRQB, forbidJsonb) {
         /** @deprecated */
         __publicField(this, "_query");
         // TO-DO: Figure out how to pass DrizzleTypeError without breaking withReplicas
@@ -35276,6 +35285,7 @@ var init_db2 = __esm({
         this.dialect = dialect6;
         this.session = session;
         this.rowModeRQB = rowModeRQB;
+        this.forbidJsonb = forbidJsonb;
         const rel = relations ?? {};
         this._ = _schema ? {
           schema: _schema.schema,
@@ -35316,7 +35326,8 @@ var init_db2 = __esm({
               relation,
               dialect6,
               session,
-              rowModeRQB
+              rowModeRQB,
+              forbidJsonb
             );
           }
         }
@@ -35736,8 +35747,8 @@ var init_session2 = __esm({
     };
     __publicField(SQLiteSession, _a237, "SQLiteSession");
     SQLiteTransaction = class extends (_b160 = BaseSQLiteDatabase, _a238 = entityKind, _b160) {
-      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0, rowModeRQB) {
-        super(resultType, dialect6, session, relations, schema5, rowModeRQB);
+      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0, rowModeRQB, forbidJsonb) {
+        super(resultType, dialect6, session, relations, schema5, rowModeRQB, forbidJsonb);
         this.relations = relations;
         this.schema = schema5;
         this.nestedIndex = nestedIndex;

package/api.mjs

@@ -23708,8 +23708,6 @@ var init_relations = __esm({
         this.tables = tables;
         this.config = config;
         for (const [tsName, table6] of Object.entries(tables)) {
-          if (config[tsName]?.$drizzleTypeError)
-            continue;
           const isTable2 = is(table6, Table2);
           const isView2 = is(table6, View3);
           if (!(isTable2 || isView2))
@@ -23816,14 +23814,14 @@ var init_relations = __esm({
               );
               if (reverseRelations.length > 1) {
                 throw new Error(
-                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${getTableUniqueName(relation.sourceTable)}" were found.
+                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${this.tableNamesMap[getTableUniqueName(relation.sourceTable)] ?? getTableUniqueName(relation.sourceTable)}" were found.
 Hint: you can specify "alias" on both sides of the relation with the same value`
                 );
               }
               reverseRelation = reverseRelations[0];
               if (!reverseRelation) {
                 throw new Error(
-                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${getTableUniqueName(relation.sourceTable)}" was found`
+                  `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${this.tableNamesMap[getTableUniqueName(relation.sourceTable)] ?? getTableUniqueName(relation.sourceTable)}" was found`
                 );
               }
             }
@@ -33536,7 +33534,8 @@ var init_dialect2 = __esm({
         isNested,
         errorPath,
         depth,
-        throughJoin
+        throughJoin,
+        jsonb: jsonb2
       }) {
         const selection = [];
         const isSingle = mode === "first";
@@ -33589,7 +33588,8 @@ var init_dialect2 = __esm({
                 isNested: true,
                 errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
                 depth: currentDepth + 1,
-                throughJoin: throughJoin2
+                throughJoin: throughJoin2,
+                jsonb: jsonb2
               });
               selection.push({
                 field: targetTable,
@@ -33600,12 +33600,12 @@ var init_dialect2 = __esm({
               });
               const jsonColumns = sql.join(
                 innerQuery.selection.map((s) => {
-                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`jsonb(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
+                  return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`${jsonb2}(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
                 }),
                 sql`, `
               );
-              const json4 = isNested ? sql`jsonb` : sql`json`;
-              const joinQuery = isSingle2 ? sql`(select ${json4}_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${json4}_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), jsonb_array()) as ${sql.identifier(k)}`;
+              const json4 = isNested ? jsonb2 : sql`json`;
+              const joinQuery = isSingle2 ? sql`(select ${json4}_object(${jsonColumns}) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}` : sql`coalesce((select ${json4}_group_array(json_object(${jsonColumns})) as ${sql.identifier("r")} from (${innerQuery.sql}) as ${sql.identifier("t")}), ${jsonb2}_array()) as ${sql.identifier(k)}`;
               return joinQuery;
             }),
             sql`, `
@@ -35006,7 +35006,7 @@ var init_query4 = __esm({
     init_sql();
     _a225 = entityKind;
     RelationalQueryBuilder2 = class {
-      constructor(mode, tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, rowMode) {
+      constructor(mode, tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, rowMode, forbidJsonb) {
         this.mode = mode;
         this.tables = tables;
         this.schema = schema5;
@@ -35016,6 +35016,7 @@ var init_query4 = __esm({
         this.dialect = dialect6;
         this.session = session;
         this.rowMode = rowMode;
+        this.forbidJsonb = forbidJsonb;
       }
       findMany(config) {
         return this.mode === "sync" ? new SQLiteSyncRelationalQuery2(
@@ -35028,7 +35029,8 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "many",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -35039,7 +35041,8 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "many",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         );
       }
       findFirst(config) {
@@ -35053,7 +35056,8 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "first",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         ) : new SQLiteRelationalQuery2(
           this.tables,
           this.schema,
@@ -35064,13 +35068,14 @@ var init_query4 = __esm({
           this.session,
           config ?? true,
           "first",
-          this.rowMode
+          this.rowMode,
+          this.forbidJsonb
         );
       }
     };
     __publicField(RelationalQueryBuilder2, _a225, "SQLiteAsyncRelationalQueryBuilderV2");
     SQLiteRelationalQuery2 = class extends (_b156 = QueryPromise, _a226 = entityKind, _b156) {
-      constructor(tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, config, mode, rowMode) {
+      constructor(tables, schema5, tableNamesMap, table6, tableConfig, dialect6, session, config, mode, rowMode, forbidJsonb) {
         super();
         /** @internal */
         __publicField(this, "mode");
@@ -35084,6 +35089,7 @@ var init_query4 = __esm({
         this.session = session;
         this.config = config;
         this.rowMode = rowMode;
+        this.forbidJsonb = forbidJsonb;
         this.mode = mode;
         this.table = table6;
       }
@@ -35096,7 +35102,8 @@ var init_query4 = __esm({
           tableConfig: this.tableConfig,
           queryConfig: this.config,
           tables: this.tables,
-          mode: this.mode
+          mode: this.mode,
+          jsonb: this.forbidJsonb ? sql`json` : sql`jsonb`
         });
         return query.sql;
       }
@@ -35120,6 +35127,7 @@ var init_query4 = __esm({
         return this._prepare(false);
       }
       _getQuery() {
+        const jsonb2 = this.forbidJsonb ? sql`json` : sql`jsonb`;
         const query = this.dialect.buildRelationalQuery({
           schema: this.schema,
           tableNamesMap: this.tableNamesMap,
@@ -35128,12 +35136,13 @@ var init_query4 = __esm({
           queryConfig: this.config,
           tables: this.tables,
           mode: this.mode,
-          isNested: this.rowMode
+          isNested: this.rowMode,
+          jsonb: jsonb2
         });
         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)}`;
+              return sql`${sql.raw(this.dialect.escapeString(s.key))}, ${s.selection ? sql`${jsonb2}(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
             }),
             sql`, `
           );
@@ -35222,7 +35231,7 @@ var init_db2 = __esm({
     init_raw2();
     _a229 = entityKind;
     BaseSQLiteDatabase = class {
-      constructor(resultKind, dialect6, session, relations, _schema, rowModeRQB) {
+      constructor(resultKind, dialect6, session, relations, _schema, rowModeRQB, forbidJsonb) {
         /** @deprecated */
         __publicField(this, "_query");
         // TO-DO: Figure out how to pass DrizzleTypeError without breaking withReplicas
@@ -35281,6 +35290,7 @@ var init_db2 = __esm({
         this.dialect = dialect6;
         this.session = session;
         this.rowModeRQB = rowModeRQB;
+        this.forbidJsonb = forbidJsonb;
         const rel = relations ?? {};
         this._ = _schema ? {
           schema: _schema.schema,
@@ -35321,7 +35331,8 @@ var init_db2 = __esm({
               relation,
               dialect6,
               session,
-              rowModeRQB
+              rowModeRQB,
+              forbidJsonb
             );
           }
         }
@@ -35741,8 +35752,8 @@ var init_session2 = __esm({
     };
     __publicField(SQLiteSession, _a237, "SQLiteSession");
     SQLiteTransaction = class extends (_b160 = BaseSQLiteDatabase, _a238 = entityKind, _b160) {
-      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0, rowModeRQB) {
-        super(resultType, dialect6, session, relations, schema5, rowModeRQB);
+      constructor(resultType, dialect6, session, relations, schema5, nestedIndex = 0, rowModeRQB, forbidJsonb) {
+        super(resultType, dialect6, session, relations, schema5, rowModeRQB, forbidJsonb);
         this.relations = relations;
         this.schema = schema5;
         this.nestedIndex = nestedIndex;

package/bin.cjs

@@ -92669,7 +92669,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "1.0.0-beta.1-e30ede4";
+  const envVersion = "1.0.0-beta.1-af4c434";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "1.0.0-beta.1-e30ede4",
+	"version": "1.0.0-beta.1-af4c434",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",