drizzle-kit 1.0.0-beta.1-6b935a0 → 1.0.0-beta.1-7946562

package/api.js

@@ -22282,14 +22282,6 @@ var init_common2 = __esm({
         }
         return value.map((v) => this.baseColumn.mapFromDriverValue(v));
       }
-      // Needed for arrays of custom types
-      mapFromJsonValue(value) {
-        if (typeof value === "string") {
-          value = parsePgArray(value);
-        }
-        const base = this.baseColumn;
-        return "mapFromJsonValue" in base ? value.map((v) => base.mapFromJsonValue(v)) : value.map((v) => base.mapFromDriverValue(v));
-      }
       mapToDriverValue(value, isNestedArray = false) {
         const a = value.map(
           (v) => v === null ? null : is(this.baseColumn, _PgArray) ? this.baseColumn.mapToDriverValue(v, true) : this.baseColumn.mapToDriverValue(v)
@@ -23411,7 +23403,7 @@ function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (valu
     } else {
       decoder = field.getSQL().decoder;
     }
-    row[selectionItem.key] = "mapFromJsonValue" in decoder ? decoder.mapFromJsonValue(value) : decoder.mapFromDriverValue(value);
+    row[selectionItem.key] = decoder.mapFromDriverValue(value);
   }
   return row;
 }
@@ -24866,13 +24858,9 @@ var init_custom = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -24880,29 +24868,6 @@ var init_custom = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2, arrayDimensions) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2, arrayDimensions);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "bytea":
-          case "geometry":
-          case "timestamp":
-          case "numeric":
-          case "bigint": {
-            const arrVal = "[]".repeat(arrayDimensions ?? 0);
-            return sql2`${name2}::text${sql2.raw(arrVal).if(arrayDimensions)}`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -27585,11 +27550,11 @@ var init_dialect = __esm({
           const name2 = sql`${table6}.${sql.identifier(this.casing.getColumnCasing(column6))}`;
           let targetType = column6.columnType;
           let col = column6;
-          let dimensionCnt = 0;
+          let arrVal = "";
           while (is(col, PgArray)) {
-            col = col.baseColumn;
+            col = column6.baseColumn;
             targetType = col.columnType;
-            ++dimensionCnt;
+            arrVal = arrVal + "[]";
           }
           switch (targetType) {
             case "PgNumeric":
@@ -27601,12 +27566,8 @@ var init_dialect = __esm({
             case "PgGeometry":
             case "PgGeometryObject":
             case "PgBytea": {
-              const arrVal = "[]".repeat(dimensionCnt);
               return sql`${name2}::text${sql.raw(arrVal).if(arrVal)} as ${sql.identifier(key)}`;
             }
-            case "PgCustomColumn": {
-              return sql`${col.jsonWrapName(name2, sql, dimensionCnt > 0 ? dimensionCnt : void 0)} as ${sql.identifier(key)}`;
-            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -32570,13 +32531,9 @@ var init_custom2 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -32584,29 +32541,6 @@ var init_custom2 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "numeric":
-          case "decimal":
-          case "bigint": {
-            return sql2`cast(${name2} as text)`;
-          }
-          case "blob": {
-            return sql2`hex(${name2})`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -33800,9 +33734,6 @@ var init_dialect2 = __esm({
             case "SQLiteNumericBigInt": {
               return sql`cast(${name2} as text) as ${sql.identifier(key)}`;
             }
-            case "SQLiteCustomColumn": {
-              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
-            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -37412,13 +37343,9 @@ var init_custom3 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -37426,30 +37353,6 @@ var init_custom3 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "binary":
-          case "varbinary":
-          case "time":
-          case "datetime":
-          case "decimal":
-          case "float":
-          case "bigint": {
-            return sql2`cast(${name2} as char)`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -39808,9 +39711,6 @@ var init_dialect3 = __esm({
             case "MySqlBigInt64": {
               return sql`cast(${name2} as char) as ${sql.identifier(key)}`;
             }
-            case "MySqlCustomColumn": {
-              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
-            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -43413,13 +43313,9 @@ var init_custom4 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -43427,30 +43323,6 @@ var init_custom4 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "binary":
-          case "varbinary":
-          case "time":
-          case "datetime":
-          case "decimal":
-          case "float":
-          case "bigint": {
-            return sql2`cast(${name2} as char)`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }

package/api.mjs

@@ -22287,14 +22287,6 @@ var init_common2 = __esm({
         }
         return value.map((v) => this.baseColumn.mapFromDriverValue(v));
       }
-      // Needed for arrays of custom types
-      mapFromJsonValue(value) {
-        if (typeof value === "string") {
-          value = parsePgArray(value);
-        }
-        const base = this.baseColumn;
-        return "mapFromJsonValue" in base ? value.map((v) => base.mapFromJsonValue(v)) : value.map((v) => base.mapFromDriverValue(v));
-      }
       mapToDriverValue(value, isNestedArray = false) {
         const a = value.map(
           (v) => v === null ? null : is(this.baseColumn, _PgArray) ? this.baseColumn.mapToDriverValue(v, true) : this.baseColumn.mapToDriverValue(v)
@@ -23416,7 +23408,7 @@ function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (valu
     } else {
       decoder = field.getSQL().decoder;
     }
-    row[selectionItem.key] = "mapFromJsonValue" in decoder ? decoder.mapFromJsonValue(value) : decoder.mapFromDriverValue(value);
+    row[selectionItem.key] = decoder.mapFromDriverValue(value);
   }
   return row;
 }
@@ -24871,13 +24863,9 @@ var init_custom = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -24885,29 +24873,6 @@ var init_custom = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2, arrayDimensions) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2, arrayDimensions);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "bytea":
-          case "geometry":
-          case "timestamp":
-          case "numeric":
-          case "bigint": {
-            const arrVal = "[]".repeat(arrayDimensions ?? 0);
-            return sql2`${name2}::text${sql2.raw(arrVal).if(arrayDimensions)}`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -27590,11 +27555,11 @@ var init_dialect = __esm({
           const name2 = sql`${table6}.${sql.identifier(this.casing.getColumnCasing(column6))}`;
           let targetType = column6.columnType;
           let col = column6;
-          let dimensionCnt = 0;
+          let arrVal = "";
           while (is(col, PgArray)) {
-            col = col.baseColumn;
+            col = column6.baseColumn;
             targetType = col.columnType;
-            ++dimensionCnt;
+            arrVal = arrVal + "[]";
           }
           switch (targetType) {
             case "PgNumeric":
@@ -27606,12 +27571,8 @@ var init_dialect = __esm({
             case "PgGeometry":
             case "PgGeometryObject":
             case "PgBytea": {
-              const arrVal = "[]".repeat(dimensionCnt);
               return sql`${name2}::text${sql.raw(arrVal).if(arrVal)} as ${sql.identifier(key)}`;
             }
-            case "PgCustomColumn": {
-              return sql`${col.jsonWrapName(name2, sql, dimensionCnt > 0 ? dimensionCnt : void 0)} as ${sql.identifier(key)}`;
-            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -32575,13 +32536,9 @@ var init_custom2 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -32589,29 +32546,6 @@ var init_custom2 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "numeric":
-          case "decimal":
-          case "bigint": {
-            return sql2`cast(${name2} as text)`;
-          }
-          case "blob": {
-            return sql2`hex(${name2})`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -33805,9 +33739,6 @@ var init_dialect2 = __esm({
             case "SQLiteNumericBigInt": {
               return sql`cast(${name2} as text) as ${sql.identifier(key)}`;
             }
-            case "SQLiteCustomColumn": {
-              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
-            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -37417,13 +37348,9 @@ var init_custom3 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -37431,30 +37358,6 @@ var init_custom3 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "binary":
-          case "varbinary":
-          case "time":
-          case "datetime":
-          case "decimal":
-          case "float":
-          case "bigint": {
-            return sql2`cast(${name2} as char)`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }
@@ -39813,9 +39716,6 @@ var init_dialect3 = __esm({
             case "MySqlBigInt64": {
               return sql`cast(${name2} as char) as ${sql.identifier(key)}`;
             }
-            case "MySqlCustomColumn": {
-              return sql`${column6.jsonWrapName(name2, sql)} as ${sql.identifier(key)}`;
-            }
             default: {
               return sql`${name2} as ${sql.identifier(key)}`;
             }
@@ -43418,13 +43318,9 @@ var init_custom4 = __esm({
         __publicField(this, "sqlName");
         __publicField(this, "mapTo");
         __publicField(this, "mapFrom");
-        __publicField(this, "mapJson");
-        __publicField(this, "wrapName");
         this.sqlName = config.customTypeParams.dataType(config.fieldConfig);
         this.mapTo = config.customTypeParams.toDriver;
         this.mapFrom = config.customTypeParams.fromDriver;
-        this.mapJson = config.customTypeParams.fromJson;
-        this.wrapName = config.customTypeParams.jsonWrap;
       }
       getSQLType() {
         return this.sqlName;
@@ -43432,30 +43328,6 @@ var init_custom4 = __esm({
       mapFromDriverValue(value) {
         return typeof this.mapFrom === "function" ? this.mapFrom(value) : value;
       }
-      mapFromJsonValue(value) {
-        return typeof this.mapJson === "function" ? this.mapJson(value) : this.mapFromDriverValue(value);
-      }
-      jsonWrapName(name2, sql2) {
-        if (typeof this.wrapName === "function")
-          return this.wrapName(name2, sql2);
-        const rawType = this.getSQLType().toLowerCase();
-        const parenPos = rawType.indexOf("(");
-        const type = parenPos + 1 ? rawType.slice(0, parenPos) : rawType;
-        switch (type) {
-          case "binary":
-          case "varbinary":
-          case "time":
-          case "datetime":
-          case "decimal":
-          case "float":
-          case "bigint": {
-            return sql2`cast(${name2} as char)`;
-          }
-          default: {
-            return name2;
-          }
-        }
-      }
       mapToDriverValue(value) {
         return typeof this.mapTo === "function" ? this.mapTo(value) : value;
       }

package/bin.cjs

@@ -85706,6 +85706,70 @@ __export(introspect_exports, {
   introspectSqlite: () => introspectSqlite,
   relationsToTypeScript: () => relationsToTypeScript
 });
+function postgresToRelationsPull(schema6) {
+  return Object.values(schema6.tables).map((table6) => ({
+    schema: table6.schema,
+    foreignKeys: Object.values(table6.foreignKeys),
+    uniques: [
+      ...Object.values(table6.uniqueConstraints).map((unq) => ({
+        columns: unq.columns
+      })),
+      ...Object.values(table6.indexes).map((idx) => ({
+        columns: idx.columns.map((idxc) => {
+          if (!idxc.isExpression && idx.isUnique) {
+            return idxc.expression;
+          }
+        }).filter((item) => item !== void 0)
+      }))
+    ]
+  }));
+}
+function gelToRelationsPull(schema6) {
+  return Object.values(schema6.tables).map((table6) => ({
+    schema: table6.schema,
+    foreignKeys: Object.values(table6.foreignKeys),
+    uniques: [
+      ...Object.values(table6.uniqueConstraints).map((unq) => ({
+        columns: unq.columns
+      })),
+      ...Object.values(table6.indexes).map((idx) => ({
+        columns: idx.columns.map((idxc) => {
+          if (!idxc.isExpression && idx.isUnique) {
+            return idxc.expression;
+          }
+        }).filter((item) => item !== void 0)
+      }))
+    ]
+  }));
+}
+function mysqlToRelationsPull(schema6) {
+  return Object.values(schema6.tables).map((table6) => ({
+    schema: void 0,
+    foreignKeys: Object.values(table6.foreignKeys),
+    uniques: [
+      ...Object.values(table6.uniqueConstraints).map((unq) => ({
+        columns: unq.columns
+      })),
+      ...Object.values(table6.indexes).map((idx) => ({
+        columns: idx.columns
+      }))
+    ]
+  }));
+}
+function sqliteToRelationsPull(schema6) {
+  return Object.values(schema6.tables).map((table6) => ({
+    schema: void 0,
+    foreignKeys: Object.values(table6.foreignKeys),
+    uniques: [
+      ...Object.values(table6.uniqueConstraints).map((unq) => ({
+        columns: unq.columns
+      })),
+      ...Object.values(table6.indexes).map((idx) => ({
+        columns: idx.columns
+      }))
+    ]
+  }));
+}
 var import_fs11, import_hanji14, import_path7, import_pluralize, introspectPostgres, introspectGel, introspectMysql, introspectSingleStore, introspectSqlite, introspectLibSQL, withCasing4, relationsToTypeScript;
 var init_introspect = __esm({
   "src/cli/commands/introspect.ts"() {
@@ -85775,7 +85839,7 @@ var init_introspect = __esm({
       );
       const schema6 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript4(schema6, casing2);
-      const relationsTs = relationsToTypeScript(schema6, casing2);
+      const relationsTs = relationsToTypeScript(postgresToRelationsPull(schema6), casing2);
       const { internal, ...schemaWithoutInternals } = schema6;
       const schemaFile = (0, import_path7.join)(out, "schema.ts");
       (0, import_fs11.writeFileSync)(schemaFile, ts.file);
@@ -85870,7 +85934,7 @@ var init_introspect = __esm({
       );
       const schema6 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript2(schema6, casing2);
-      const relationsTs = relationsToTypeScript(schema6, casing2);
+      const relationsTs = relationsToTypeScript(gelToRelationsPull(schema6), casing2);
       const { internal, ...schemaWithoutInternals } = schema6;
       const schemaFile = (0, import_path7.join)(out, "schema.ts");
       (0, import_fs11.writeFileSync)(schemaFile, ts.file);
@@ -85925,7 +85989,7 @@ var init_introspect = __esm({
       );
       const schema6 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript3(schema6, casing2);
-      const relationsTs = relationsToTypeScript(schema6, casing2);
+      const relationsTs = relationsToTypeScript(mysqlToRelationsPull(schema6), casing2);
       const { internal, ...schemaWithoutInternals } = schema6;
       const schemaFile = (0, import_path7.join)(out, "schema.ts");
       (0, import_fs11.writeFileSync)(schemaFile, ts.file);
@@ -86081,7 +86145,7 @@ var init_introspect = __esm({
       );
       const schema6 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript(schema6, casing2);
-      const relationsTs = relationsToTypeScript(schema6, casing2);
+      const relationsTs = relationsToTypeScript(sqliteToRelationsPull(schema6), casing2);
       const schemaFile = (0, import_path7.join)(out, "schema.ts");
       (0, import_fs11.writeFileSync)(schemaFile, ts.file);
       const relationsFile = (0, import_path7.join)(out, "relations.ts");
@@ -86163,7 +86227,7 @@ var init_introspect = __esm({
       );
       const schema6 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript(schema6, casing2);
-      const relationsTs = relationsToTypeScript(schema6, casing2);
+      const relationsTs = relationsToTypeScript(sqliteToRelationsPull(schema6), casing2);
       const schemaFile = (0, import_path7.join)(out, "schema.ts");
       (0, import_fs11.writeFileSync)(schemaFile, ts.file);
       const relationsFile = (0, import_path7.join)(out, "relations.ts");
@@ -86223,7 +86287,7 @@ var init_introspect = __esm({
     relationsToTypeScript = (schema6, casing2) => {
       const imports = [];
       const tableRelations = {};
-      Object.values(schema6.tables).forEach((table6) => {
+      schema6.forEach((table6) => {
         const fks = Object.values(table6.foreignKeys);
         if (fks.length === 2) {
           const [fk1, fk22] = fks;
@@ -86255,6 +86319,7 @@ var init_introspect = __esm({
             }
             tableRelations[toTable2].push({
               name: (0, import_pluralize.plural)(toTable1),
+              // this type is used for .many() side of relation, when another side has .through() with from and to fields
               type: "many-through",
               tableFrom: toTable2,
               columnsFrom: fk22.columnsTo,
@@ -86290,14 +86355,27 @@ var init_introspect = __esm({
             if (!tableRelations[keyTo]) {
               tableRelations[keyTo] = [];
             }
-            tableRelations[keyTo].push({
-              name: (0, import_pluralize.plural)(tableFrom),
-              type: "many",
-              tableFrom: tableTo,
-              columnsFrom: columnsTo,
-              tableTo: tableFrom,
-              columnsTo: columnsFrom
-            });
+            if (table6.uniques.find(
+              (constraint) => constraint.columns.length === columnsFrom.length && constraint.columns.every((col, i2) => col === columnsFrom[i2])
+            )) {
+              tableRelations[keyTo].push({
+                name: (0, import_pluralize.plural)(tableFrom),
+                type: "one-one",
+                tableFrom: tableTo,
+                columnsFrom: columnsTo,
+                tableTo: tableFrom,
+                columnsTo: columnsFrom
+              });
+            } else {
+              tableRelations[keyTo].push({
+                name: (0, import_pluralize.plural)(tableFrom),
+                type: "many",
+                tableFrom: tableTo,
+                columnsFrom: columnsTo,
+                tableTo: tableFrom,
+                columnsTo: columnsFrom
+              });
+            }
           });
         }
       });
@@ -86317,7 +86395,7 @@ import * as schema from "./schema";
             if (hasMultipleRelations) {
               if (relation.type === "one") {
                 relationName = `${relation.tableFrom}_${relation.columnsFrom.join("_")}_${relation.tableTo}_${relation.columnsTo.join("_")}`;
-              } else if (relation.type === "many") {
+              } else if (relation.type === "many" || relation.type === "one-one") {
                 relationName = `${relation.tableTo}_${relation.columnsTo.join("_")}_${relation.tableFrom}_${relation.columnsFrom.join("_")}`;
               } else if (relation.type === "through") {
                 relationName = `${relation.tableFrom}_${relation.columnsFrom.join("_")}_${relation.tableTo}_${relation.columnsTo.join("_")}_via_${relation.tableThrough}`;
@@ -86355,6 +86433,11 @@ import * as schema from "./schema";
 		${relation.name}: r.many.${relation.tableTo}(` + (relation.relationName ? `{
 			alias: "${relation.relationName}"
 		}` : "") + `),`;
+          } else if (relation.type === "one-one") {
+            relationString += `
+		${relation.name}: r.one.${relation.tableTo}(` + (relation.relationName ? `{
+			alias: "${relation.relationName}"
+		}` : "") + `),`;
           } else {
             const from = relation.columnsThroughFrom.length === 1 ? `r.${relation.tableFrom}.${relation.columnsFrom[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughFrom[0]})` : `[${relation.columnsThroughFrom.map((it) => `r.${relation.tableFrom}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
             const to = relation.columnsThroughTo.length === 1 ? `r.${relation.tableTo}.${relation.columnsTo[0]}.through(r.${relation.tableThrough}.${relation.columnsThroughTo[0]})` : `[${relation.columnsThroughTo.map((it) => `r.${relation.tableTo}.${it}.through(${relation.tableThrough}.${it})`).join(", ")}]`;
@@ -92729,7 +92812,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "1.0.0-beta.1-6b935a0";
+  const envVersion = "1.0.0-beta.1-7946562";
   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-6b935a0",
+	"version": "1.0.0-beta.1-7946562",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",