drizzle-seed 0.3.1-fd5d1e8 → 0.3.1-fd8bfcc

package/index.cjs

@@ -133098,7 +133098,7 @@ class GeneratePoint extends AbstractGenerator {
         }
         const x = this.state.xCoordinateGen.generate();
         const y = this.state.yCoordinateGen.generate();
-        if (this.dataType === 'json') {
+        if (this.dataType === 'object') {
             return { x, y };
         }
         else if (this.dataType === 'string') {
@@ -133135,7 +133135,7 @@ class GenerateUniquePoint extends AbstractGenerator {
         }
         const x = this.state.xCoordinateGen.generate();
         const y = this.state.yCoordinateGen.generate();
-        if (this.dataType === 'json') {
+        if (this.dataType === 'object') {
             return { x, y };
         }
         else if (this.dataType === 'string') {
@@ -133184,7 +133184,7 @@ class GenerateLine extends AbstractGenerator {
             b = this.state.bCoefficientGen.generate();
         }
         const c = this.state.cCoefficientGen.generate();
-        if (this.dataType === 'json') {
+        if (this.dataType === 'object') {
             return { a, b, c };
         }
         else if (this.dataType === 'string') {
@@ -133232,7 +133232,7 @@ class GenerateUniqueLine extends AbstractGenerator {
             b = this.state.bCoefficientGen.generate();
         }
         const c = this.state.cCoefficientGen.generate();
-        if (this.dataType === 'json') {
+        if (this.dataType === 'object') {
             return { a, b, c };
         }
         else if (this.dataType === 'string') {
@@ -134946,7 +134946,7 @@ class SeedService {
                 const generator = new generatorsMap.GenerateBoolean[0]();
                 return generator;
             }
-            if ((col.columnType === 'integer' && col.dataType === 'date')) {
+            if ((col.columnType === 'integer' && col.dataType === 'object')) {
                 const generator = new generatorsMap.GenerateTimestamp[0]();
                 return generator;
             }
@@ -135571,8 +135571,10 @@ const getPostgresInfo = (pgSchema, pgTables) => {
             return dbToTsColumnNamesMap;
         }
         const tableConfig = pgCore.getTableConfig(table);
-        for (const [tsCol, col] of Object.entries(tableConfig.columns[0].table)) {
-            dbToTsColumnNamesMap[col.name] = tsCol;
+        for (const [tsCol, col] of Object.entries(drizzleOrm.getColumnTable(tableConfig.columns[0]))) {
+            // dbToTsColumnNamesMap[col.name] = tsCol;
+            if (drizzleOrm.is(col, drizzleOrm.Column))
+                dbToTsColumnNamesMap[col.name] = tsCol;
         }
         dbToTsColumnNamesMapGlobal[tableName] = dbToTsColumnNamesMap;
         return dbToTsColumnNamesMap;
@@ -135628,10 +135630,7 @@ const getPostgresInfo = (pgSchema, pgTables) => {
     };
     for (const table of Object.values(pgTables)) {
         tableConfig = pgCore.getTableConfig(table);
-        dbToTsColumnNamesMap = {};
-        for (const [tsCol, col] of Object.entries(tableConfig.columns[0].table)) {
-            dbToTsColumnNamesMap[col.name] = tsCol;
-        }
+        dbToTsColumnNamesMap = getDbToTsColumnNamesMap(table);
         // might be empty list
         const newRelations = tableConfig.foreignKeys.map((fk) => {
             const table = dbToTsTableNamesMap[tableConfig.name];
@@ -135662,8 +135661,8 @@ const getPostgresInfo = (pgSchema, pgTables) => {
                 name: baseColumn.name,
                 columnType: baseColumn.getSQLType(),
                 typeParams: getTypeParams(baseColumn.getSQLType()),
-                dataType: baseColumn.dataType,
-                size: baseColumn.size,
+                dataType: baseColumn.dataType.split(' ')[0],
+                size: baseColumn.length,
                 hasDefault: baseColumn.hasDefault,
                 enumValues: baseColumn.enumValues,
                 default: baseColumn.default,
@@ -135715,8 +135714,8 @@ const getPostgresInfo = (pgSchema, pgTables) => {
                 name: dbToTsColumnNamesMap[column.name],
                 columnType: column.getSQLType(),
                 typeParams: getTypeParams(column.getSQLType()),
-                dataType: column.dataType,
-                size: column.size,
+                dataType: column.dataType.split(' ')[0],
+                size: column.length,
                 hasDefault: column.hasDefault,
                 default: column.default,
                 enumValues: column.enumValues,
@@ -135821,8 +135820,9 @@ const getMySqlInfo = (mysqlSchema, mysqlTables) => {
             return dbToTsColumnNamesMap;
         }
         const tableConfig = mysqlCore.getTableConfig(table);
-        for (const [tsCol, col] of Object.entries(tableConfig.columns[0].table)) {
-            dbToTsColumnNamesMap[col.name] = tsCol;
+        for (const [tsCol, col] of Object.entries(drizzleOrm.getColumnTable(tableConfig.columns[0]))) {
+            if (drizzleOrm.is(col, drizzleOrm.Column))
+                dbToTsColumnNamesMap[col.name] = tsCol;
         }
         dbToTsColumnNamesMapGlobal[tableName] = dbToTsColumnNamesMap;
         return dbToTsColumnNamesMap;
@@ -135878,10 +135878,7 @@ const getMySqlInfo = (mysqlSchema, mysqlTables) => {
     };
     for (const table of Object.values(mysqlTables)) {
         tableConfig = mysqlCore.getTableConfig(table);
-        dbToTsColumnNamesMap = {};
-        for (const [tsCol, col] of Object.entries(tableConfig.columns[0].table)) {
-            dbToTsColumnNamesMap[col.name] = tsCol;
-        }
+        dbToTsColumnNamesMap = getDbToTsColumnNamesMap(table);
         const newRelations = tableConfig.foreignKeys.map((fk) => {
             const table = dbToTsTableNamesMap[tableConfig.name];
             const refTable = dbToTsTableNamesMap[drizzleOrm.getTableName(fk.reference().foreignTable)];
@@ -135936,7 +135933,7 @@ const getMySqlInfo = (mysqlSchema, mysqlTables) => {
                 name: dbToTsColumnNamesMap[column.name],
                 columnType: column.getSQLType(),
                 typeParams: getTypeParams(column.getSQLType()),
-                dataType: column.dataType,
+                dataType: column.dataType.split(' ')[0],
                 hasDefault: column.hasDefault,
                 default: column.default,
                 enumValues: column.enumValues,
@@ -136007,8 +136004,9 @@ const getSqliteInfo = (sqliteSchema, sqliteTables) => {
             return dbToTsColumnNamesMap;
         }
         const tableConfig = sqliteCore.getTableConfig(table);
-        for (const [tsCol, col] of Object.entries(tableConfig.columns[0].table)) {
-            dbToTsColumnNamesMap[col.name] = tsCol;
+        for (const [tsCol, col] of Object.entries(drizzleOrm.getColumnTable(tableConfig.columns[0]))) {
+            if (drizzleOrm.is(col, drizzleOrm.Column))
+                dbToTsColumnNamesMap[col.name] = tsCol;
         }
         dbToTsColumnNamesMapGlobal[tableName] = dbToTsColumnNamesMap;
         return dbToTsColumnNamesMap;
@@ -136063,10 +136061,7 @@ const getSqliteInfo = (sqliteSchema, sqliteTables) => {
     };
     for (const table of Object.values(sqliteTables)) {
         tableConfig = sqliteCore.getTableConfig(table);
-        dbToTsColumnNamesMap = {};
-        for (const [tsCol, col] of Object.entries(tableConfig.columns[0].table)) {
-            dbToTsColumnNamesMap[col.name] = tsCol;
-        }
+        dbToTsColumnNamesMap = getDbToTsColumnNamesMap(table);
         const newRelations = tableConfig.foreignKeys.map((fk) => {
             const table = dbToTsTableNamesMap[tableConfig.name];
             const refTable = dbToTsTableNamesMap[drizzleOrm.getTableName(fk.reference().foreignTable)];
@@ -136117,7 +136112,7 @@ const getSqliteInfo = (sqliteSchema, sqliteTables) => {
                 name: dbToTsColumnNamesMap[column.name],
                 columnType: column.getSQLType(),
                 typeParams: getTypeParams(column.getSQLType()),
-                dataType: column.dataType,
+                dataType: column.dataType.split(' ')[0],
                 hasDefault: column.hasDefault,
                 default: column.default,
                 enumValues: column.enumValues,