relq 1.0.83 → 1.0.85

package/dist/cjs/cli/utils/ast-codegen.cjs

@@ -255,11 +255,21 @@ function generateColumnCode(col, useCamelCase, enumNames, domainNames, checkOver
     const normalizedType = col.type.toLowerCase();
     if (enumNames.has(normalizedType) || enumNames.has(col.type)) {
         const enumName = `${(0, utils_1.toCamelCase)(col.type)}Enum`;
-        line = `    ${colName}: ${enumName}()`;
+        if (useCamelCase && colName !== col.name) {
+            line = `    ${colName}: ${enumName}('${col.name}')`;
+        }
+        else {
+            line = `    ${colName}: ${enumName}()`;
+        }
     }
     else if (domainNames.has(normalizedType) || domainNames.has(col.type)) {
         const domainName = `${(0, utils_1.toCamelCase)(col.type)}Domain`;
-        line = `    ${colName}: ${domainName}()`;
+        if (useCamelCase && colName !== col.name) {
+            line = `    ${colName}: ${domainName}('${col.name}')`;
+        }
+        else {
+            line = `    ${colName}: ${domainName}()`;
+        }
     }
     else {
         let typeBuilder;
@@ -676,7 +686,8 @@ function generateTableCode(table, useCamelCase, enumNames, domainNames, columnTy
 function generateEnumCode(enumDef, useCamelCase) {
     const baseName = useCamelCase ? (0, utils_1.toCamelCase)(enumDef.name) : enumDef.name;
     const enumName = `${baseName}Enum`;
-    const valuesStr = enumDef.values.map(v => `'${(0, utils_1.escapeString)(v)}'`).join(', ');
+    const values = Array.isArray(enumDef.values) ? enumDef.values : typeof enumDef.values === 'string' ? enumDef.values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [];
+    const valuesStr = values.map(v => `'${(0, utils_1.escapeString)(v)}'`).join(', ');
     const trackingId = enumDef.trackingId || generateTrackingId('e');
     return `export const ${enumName} = pgEnum('${enumDef.name}', [${valuesStr}]).$id('${trackingId}')`;
 }

package/dist/cjs/cli/utils/cockroachdb/introspect.cjs

@@ -212,7 +212,7 @@ async function introspectCockroachDB(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/cjs/cli/utils/dsql/introspect.cjs

@@ -196,7 +196,7 @@ async function introspectDsql(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/cjs/cli/utils/nile/introspect.cjs

@@ -231,7 +231,7 @@ async function introspectNile(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/cjs/cli/utils/postgres/introspect.cjs

@@ -224,7 +224,7 @@ async function introspectPostgres(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/cjs/cli/utils/schema-to-ast.cjs

@@ -538,7 +538,7 @@ function compositeToAST(composite) {
         const config = fieldDef.$config || fieldDef;
         attributes.push({
             name: fieldName,
-            type: config.$type || 'text',
+            type: config.$sqlType || (typeof config.$type === 'string' ? config.$type : null) || 'text',
             collation: config.$collation,
         });
     }

package/dist/cjs/core/helpers/ConnectedSelectBuilder.cjs

@@ -63,30 +63,55 @@ class ConnectedSelectBuilder {
                 }
                 const tableColumns = joinedTableDef.$columns || joinedTableDef;
                 const dbToProp = new Map();
+                const propTypes = new Map();
                 for (const [propName, colDef] of Object.entries(tableColumns)) {
                     const dbColName = colDef?.$columnName ?? propName;
                     dbToProp.set(dbColName, propName);
+                    const snakeCase = propName.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
+                    if (snakeCase !== propName && !dbToProp.has(snakeCase)) {
+                        dbToProp.set(snakeCase, propName);
+                    }
+                    const sqlType = colDef?.$sqlType || (typeof colDef?.$type === 'string' ? colDef.$type : undefined);
+                    if (sqlType) {
+                        propTypes.set(propName, sqlType.toLowerCase());
+                    }
                 }
                 if (Array.isArray(nestedData)) {
-                    transformed[alias] = nestedData.map((item) => this.transformNestedObject(item, dbToProp));
+                    transformed[alias] = nestedData.map((item) => this.transformNestedObject(item, dbToProp, propTypes));
                 }
                 else {
-                    transformed[alias] = this.transformNestedObject(nestedData, dbToProp);
+                    transformed[alias] = this.transformNestedObject(nestedData, dbToProp, propTypes);
                 }
             }
             return transformed;
         });
     }
-    transformNestedObject(obj, dbToProp) {
+    transformNestedObject(obj, dbToProp, propTypes) {
         if (!obj || typeof obj !== 'object')
             return obj;
         const result = {};
         for (const [key, value] of Object.entries(obj)) {
             const propName = dbToProp.get(key) ?? key;
-            result[propName] = value;
+            result[propName] = propTypes ? this.coerceValue(value, propTypes.get(propName)) : value;
         }
         return result;
     }
+    coerceValue(value, sqlType) {
+        if (value === null || value === undefined || !sqlType)
+            return value;
+        switch (sqlType) {
+            case 'timestamp':
+            case 'timestamptz':
+            case 'timestamp without time zone':
+            case 'timestamp with time zone':
+                return typeof value === 'string' ? new Date(value) : value;
+            case 'bigint':
+            case 'int8':
+                return typeof value === 'number' ? BigInt(value) : typeof value === 'string' ? BigInt(value) : value;
+            default:
+                return value;
+        }
+    }
     where(callback) {
         this.builder.where(callback);
         return this;

package/dist/cjs/core/helpers/select-joins.cjs

@@ -42,14 +42,24 @@ function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
     }
     const selectedProps = conditionInternals.getSelectedColumns();
     let selectColumns;
+    const toSnake = (s) => s.replace(/[A-Z]/g, l => `_${l.toLowerCase()}`);
     if (selectedProps && selectedProps.length > 0) {
         const rightColumns = rightTableDef?.$columns || rightTableDef;
         selectColumns = selectedProps.map(prop => {
             const columnDef = rightColumns?.[prop];
-            const sqlName = columnDef?.$columnName || prop;
+            const sqlName = columnDef?.$columnName || toSnake(prop);
             return { property: prop, sqlName };
         });
     }
+    else if (rightTableDef) {
+        const rightColumns = rightTableDef.$columns || rightTableDef;
+        selectColumns = Object.entries(rightColumns)
+            .filter(([_, colDef]) => colDef && typeof colDef === 'object' && '$type' in colDef)
+            .map(([propName, colDef]) => ({
+            property: propName,
+            sqlName: colDef.$columnName || toSnake(propName),
+        }));
+    }
     const joinClause = {
         type: joinType,
         table: rightTableName,

package/dist/cjs/core/shared/column-mapping.cjs

@@ -24,7 +24,7 @@ function buildColumnMappings(schema, mappings, debugLog) {
         const propToFields = new Map();
         for (const [propName, colDef] of Object.entries(columns)) {
             const dbColName = colDef?.$columnName ?? propName;
-            const colType = colDef?.$type ?? 'TEXT';
+            const colType = colDef?.$sqlType || (typeof colDef?.$type === 'string' ? colDef.$type : undefined) || 'TEXT';
             propToDb.set(propName, dbColName);
             dbToProp.set(dbColName, propName);
             propToType.set(propName, colType);

package/dist/cjs/core/shared/transform.cjs

@@ -23,8 +23,12 @@ function buildColumnTypeMap(tableDef) {
     const typeMap = new Map();
     const columns = tableDef.$columns || tableDef;
     for (const [key, colDef] of Object.entries(columns)) {
-        if (colDef && typeof colDef === 'object' && '$type' in colDef) {
-            typeMap.set(key, colDef.$type);
+        if (colDef && typeof colDef === 'object') {
+            const col = colDef;
+            const sqlType = col.$sqlType || (typeof col.$type === 'string' ? col.$type : undefined);
+            if (sqlType) {
+                typeMap.set(key, sqlType);
+            }
         }
     }
     return typeMap;

package/dist/cjs/schema-definition/pg-schema/column-types/column-builder.cjs

@@ -151,7 +151,7 @@ function createColumn(type) {
             config.$length = len;
             const baseType = config.$type.replace(/\(\d+\)/, '');
             config.$type = `${baseType}(${len})`;
-            return Object.assign(this, { $length: len, $type: config.$type });
+            return Object.assign(this, { $length: len, $type: config.$type, $sqlType: config.$type });
         },
         precision(p) {
             config.$precision = p;
@@ -159,7 +159,7 @@ function createColumn(type) {
             config.$type = config.$scale !== undefined
                 ? `${base}(${p}, ${config.$scale})`
                 : `${base}(${p})`;
-            return Object.assign(this, { $precision: p, $type: config.$type });
+            return Object.assign(this, { $precision: p, $type: config.$type, $sqlType: config.$type });
         },
         scale(s) {
             config.$scale = s;
@@ -167,7 +167,7 @@ function createColumn(type) {
             config.$type = config.$precision !== undefined
                 ? `${base}(${config.$precision}, ${s})`
                 : `${base}(38, ${s})`;
-            return Object.assign(this, { $scale: s, $type: config.$type });
+            return Object.assign(this, { $scale: s, $type: config.$type, $sqlType: config.$type });
         },
         withTimezone() {
             config.$withTimezone = true;
@@ -177,12 +177,12 @@ function createColumn(type) {
             else if (config.$type === 'TIME') {
                 config.$type = 'TIMETZ';
             }
-            return Object.assign(this, { $withTimezone: true, $type: config.$type });
+            return Object.assign(this, { $withTimezone: true, $type: config.$type, $sqlType: config.$type });
         },
         dimensions(d) {
             config.$dimensions = d;
             config.$type = `VECTOR(${d})`;
-            return Object.assign(this, { $dimensions: d, $type: config.$type });
+            return Object.assign(this, { $dimensions: d, $type: config.$type, $sqlType: config.$type });
         },
         comment(text) {
             config.$comment = text;

package/dist/cjs/schema-definition/pg-schema/column-types/custom-types.cjs

@@ -15,7 +15,7 @@ function pgComposite(name, fields) {
         const config = fieldConfig;
         return {
             name: fieldName,
-            type: config.$type,
+            type: config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT'),
             collation: undefined,
         };
     });
@@ -43,7 +43,7 @@ function generateCompositeTypeSQL(composite) {
     const fieldDefs = [];
     for (const [fieldName, fieldConfig] of Object.entries(composite.$fields)) {
         const config = fieldConfig;
-        let fieldDef = `"${fieldName}" ${config.$type}`;
+        let fieldDef = `"${fieldName}" ${config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT')}`;
         if (config.$nullable === false) {
             fieldDef += ' NOT NULL';
         }

package/dist/cjs/schema-definition/pg-schema/column-types/domain-types.cjs

@@ -139,8 +139,8 @@ function createDomainValueExpr() {
     };
 }
 function pgDomain(name, baseType, checks) {
-    const config = baseType.$config;
-    const baseTypeStr = config?.$type || 'TEXT';
+    const bt = baseType;
+    const baseTypeStr = bt.$sqlType || (typeof bt.$type === 'string' ? bt.$type : null) || 'TEXT';
     const constraints = [];
     let validateFn;
     if (checks) {
@@ -163,8 +163,8 @@ function pgDomain(name, baseType, checks) {
             }
         }
     }
-    const notNull = config?.$nullable === false;
-    const defaultValue = config?.$default;
+    const notNull = bt?.$nullable === false;
+    const defaultValue = bt?.$default;
     const domainFn = (columnName) => {
         const col = (0, column_builder_1.createColumnWithName)(name, columnName);
         if (validateFn) {

package/dist/cjs/schema-definition/pg-schema/pg-enum.cjs

@@ -8,6 +8,7 @@ function pgEnum(name, values) {
     const config = function (columnName) {
         const col = {
             $type: name,
+            $sqlType: name,
             $enumName: name,
             $checkValues: values,
         };
@@ -38,7 +39,8 @@ function pgEnum(name, values) {
             array() {
                 col.$array = true;
                 col.$type = `${name}[]`;
-                return Object.assign(this, { $array: true, $type: `${name}[]` });
+                col.$sqlType = `${name}[]`;
+                return Object.assign(this, { $array: true, $type: `${name}[]`, $sqlType: `${name}[]` });
             },
             $id(trackingId) {
                 col.$trackingId = trackingId;

package/dist/cjs/schema-definition/pg-schema/schema-builder.cjs

@@ -21,7 +21,7 @@ function createTableProxy(name, columns, tableDef) {
     for (const [colKey, colDef] of Object.entries(columns)) {
         const config = colDef.$config || colDef;
         const sqlName = config.$sqlName || config.$columnName || colKey;
-        const colType = config.$sqlType || config.$type || 'unknown';
+        const colType = config.$sqlType || (typeof config.$type === 'string' ? config.$type : undefined) || 'unknown';
         proxy[colKey] = {
             $table: name,
             $column: sqlName,

package/dist/cjs/schema-definition/pg-schema/table-definition/sql-generation.cjs

@@ -116,7 +116,7 @@ function generateCreateTableSQL(def) {
 function generateColumnSQL(name, config) {
     const actualName = config.$columnName || name;
     const parts = [pg_format_1.default.ident(actualName)];
-    let typeName = config.$type;
+    let typeName = config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT');
     if (config.$array) {
         const dims = config.$dimensions ?? 1;
         typeName += '[]'.repeat(dims);

package/dist/cjs/schema-definition/pg-schema/validate-schema/validators.cjs

@@ -76,7 +76,7 @@ function validateTable(table, tableName, features, errors, warnings, info, allow
     validateTableFeatures(table, tableName, features, errors, warnings);
 }
 function validateColumn(column, location, features, errors, warnings, allowedCustomTypes) {
-    const colType = column.$type || column.$sqlType || 'unknown';
+    const colType = column.$sqlType || (typeof column.$type === 'string' ? column.$type : undefined) || 'unknown';
     if (allowedCustomTypes.includes(colType.toUpperCase())) {
         return;
     }

package/dist/cjs/schema-definition/sqlite-schema/table-definition/ast-generation.cjs

@@ -17,7 +17,7 @@ function extractDefaultValue(col) {
     return undefined;
 }
 function resolveColumnType(col) {
-    const base = col.$sqlType || col.$type || 'TEXT';
+    const base = col.$sqlType || (typeof col.$type === 'string' ? col.$type : null) || 'TEXT';
     if (col.$length !== undefined) {
         return `${base}(${col.$length})`;
     }

package/dist/cjs/schema-definition/sqlite-schema/table-definition/sql-generation.cjs

@@ -32,7 +32,7 @@ function formatDefault(col) {
 }
 function generateColumnSQL(name, col) {
     const parts = [quoteSQLiteIdentifier(col.$columnName || name)];
-    parts.push(col.$type || 'TEXT');
+    parts.push(col.$sqlType || (typeof col.$type === 'string' ? col.$type : null) || 'TEXT');
     if (col.$primaryKey) {
         parts.push('PRIMARY KEY');
         if (col.$autoincrement) {

package/dist/cjs/schema-definition/sqlite-schema/table-definition/table-core.cjs

@@ -14,7 +14,7 @@ function sqliteTable(name, columns, options) {
     for (const [colName, colConfig] of Object.entries(columns)) {
         const col = colConfig;
         if (col.$autoincrement) {
-            const sqlType = (col.$sqlType || col.$type || '').toUpperCase();
+            const sqlType = (col.$sqlType || (typeof col.$type === 'string' ? col.$type : '') || '').toUpperCase();
             if (sqlType !== 'INTEGER' || !col.$primaryKey) {
                 throw new Error(`[sqliteTable] AUTOINCREMENT on column "${colName}" in table "${name}" ` +
                     `requires INTEGER PRIMARY KEY. Got type "${sqlType}", primaryKey=${col.$primaryKey}.`);

package/dist/cjs/utils/type-coercion.cjs

@@ -56,7 +56,8 @@ function deserializeRow(row, schema) {
     const columnMap = new Map();
     for (const [key, config] of Object.entries(schema)) {
         const dbColumnName = config.$columnName || key;
-        columnMap.set(dbColumnName, { key, type: config.$type });
+        const sqlType = config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT');
+        columnMap.set(dbColumnName, { key, type: sqlType });
     }
     for (const [dbColumn, value] of Object.entries(row)) {
         const mapping = columnMap.get(dbColumn);
@@ -102,7 +103,8 @@ function serializeRow(row, schema) {
     for (const [key, value] of Object.entries(row)) {
         const config = schema[key];
         if (config) {
-            result[key] = serializeValue(value, config.$type);
+            const sqlType = config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT');
+            result[key] = serializeValue(value, sqlType);
         }
         else {
             result[key] = value;

package/dist/esm/cli/utils/ast-codegen.js

@@ -246,11 +246,21 @@ function generateColumnCode(col, useCamelCase, enumNames, domainNames, checkOver
     const normalizedType = col.type.toLowerCase();
     if (enumNames.has(normalizedType) || enumNames.has(col.type)) {
         const enumName = `${toCamelCase(col.type)}Enum`;
-        line = `    ${colName}: ${enumName}()`;
+        if (useCamelCase && colName !== col.name) {
+            line = `    ${colName}: ${enumName}('${col.name}')`;
+        }
+        else {
+            line = `    ${colName}: ${enumName}()`;
+        }
     }
     else if (domainNames.has(normalizedType) || domainNames.has(col.type)) {
         const domainName = `${toCamelCase(col.type)}Domain`;
-        line = `    ${colName}: ${domainName}()`;
+        if (useCamelCase && colName !== col.name) {
+            line = `    ${colName}: ${domainName}('${col.name}')`;
+        }
+        else {
+            line = `    ${colName}: ${domainName}()`;
+        }
     }
     else {
         let typeBuilder;
@@ -667,7 +677,8 @@ function generateTableCode(table, useCamelCase, enumNames, domainNames, columnTy
 function generateEnumCode(enumDef, useCamelCase) {
     const baseName = useCamelCase ? toCamelCase(enumDef.name) : enumDef.name;
     const enumName = `${baseName}Enum`;
-    const valuesStr = enumDef.values.map(v => `'${escapeString(v)}'`).join(', ');
+    const values = Array.isArray(enumDef.values) ? enumDef.values : typeof enumDef.values === 'string' ? enumDef.values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [];
+    const valuesStr = values.map(v => `'${escapeString(v)}'`).join(', ');
     const trackingId = enumDef.trackingId || generateTrackingId('e');
     return `export const ${enumName} = pgEnum('${enumDef.name}', [${valuesStr}]).$id('${trackingId}')`;
 }

package/dist/esm/cli/utils/cockroachdb/introspect.js

@@ -176,7 +176,7 @@ export async function introspectCockroachDB(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/esm/cli/utils/dsql/introspect.js

@@ -160,7 +160,7 @@ export async function introspectDsql(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/esm/cli/utils/nile/introspect.js

@@ -195,7 +195,7 @@ export async function introspectNile(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/esm/cli/utils/postgres/introspect.js

@@ -188,7 +188,7 @@ export async function introspectPostgres(connection, options) {
         const enums = enumsResult.rows.map(row => ({
             name: row.enum_name,
             schema: row.enum_schema,
-            values: row.enum_values || [],
+            values: Array.isArray(row.enum_values) ? row.enum_values : typeof row.enum_values === 'string' ? row.enum_values.replace(/^\{|\}$/g, '').split(',').filter(Boolean) : [],
         }));
         onProgress?.('processing');
         const columnsByTable = new Map();

package/dist/esm/cli/utils/schema-to-ast.js

@@ -504,7 +504,7 @@ export function compositeToAST(composite) {
         const config = fieldDef.$config || fieldDef;
         attributes.push({
             name: fieldName,
-            type: config.$type || 'text',
+            type: config.$sqlType || (typeof config.$type === 'string' ? config.$type : null) || 'text',
             collation: config.$collation,
         });
     }

package/dist/esm/core/helpers/ConnectedSelectBuilder.js

@@ -60,30 +60,55 @@ export class ConnectedSelectBuilder {
                 }
                 const tableColumns = joinedTableDef.$columns || joinedTableDef;
                 const dbToProp = new Map();
+                const propTypes = new Map();
                 for (const [propName, colDef] of Object.entries(tableColumns)) {
                     const dbColName = colDef?.$columnName ?? propName;
                     dbToProp.set(dbColName, propName);
+                    const snakeCase = propName.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
+                    if (snakeCase !== propName && !dbToProp.has(snakeCase)) {
+                        dbToProp.set(snakeCase, propName);
+                    }
+                    const sqlType = colDef?.$sqlType || (typeof colDef?.$type === 'string' ? colDef.$type : undefined);
+                    if (sqlType) {
+                        propTypes.set(propName, sqlType.toLowerCase());
+                    }
                 }
                 if (Array.isArray(nestedData)) {
-                    transformed[alias] = nestedData.map((item) => this.transformNestedObject(item, dbToProp));
+                    transformed[alias] = nestedData.map((item) => this.transformNestedObject(item, dbToProp, propTypes));
                 }
                 else {
-                    transformed[alias] = this.transformNestedObject(nestedData, dbToProp);
+                    transformed[alias] = this.transformNestedObject(nestedData, dbToProp, propTypes);
                 }
             }
             return transformed;
         });
     }
-    transformNestedObject(obj, dbToProp) {
+    transformNestedObject(obj, dbToProp, propTypes) {
         if (!obj || typeof obj !== 'object')
             return obj;
         const result = {};
         for (const [key, value] of Object.entries(obj)) {
             const propName = dbToProp.get(key) ?? key;
-            result[propName] = value;
+            result[propName] = propTypes ? this.coerceValue(value, propTypes.get(propName)) : value;
         }
         return result;
     }
+    coerceValue(value, sqlType) {
+        if (value === null || value === undefined || !sqlType)
+            return value;
+        switch (sqlType) {
+            case 'timestamp':
+            case 'timestamptz':
+            case 'timestamp without time zone':
+            case 'timestamp with time zone':
+                return typeof value === 'string' ? new Date(value) : value;
+            case 'bigint':
+            case 'int8':
+                return typeof value === 'number' ? BigInt(value) : typeof value === 'string' ? BigInt(value) : value;
+            default:
+                return value;
+        }
+    }
     where(callback) {
         this.builder.where(callback);
         return this;

package/dist/esm/core/helpers/select-joins.js

@@ -38,14 +38,24 @@ export function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
     }
     const selectedProps = conditionInternals.getSelectedColumns();
     let selectColumns;
+    const toSnake = (s) => s.replace(/[A-Z]/g, l => `_${l.toLowerCase()}`);
     if (selectedProps && selectedProps.length > 0) {
         const rightColumns = rightTableDef?.$columns || rightTableDef;
         selectColumns = selectedProps.map(prop => {
             const columnDef = rightColumns?.[prop];
-            const sqlName = columnDef?.$columnName || prop;
+            const sqlName = columnDef?.$columnName || toSnake(prop);
             return { property: prop, sqlName };
         });
     }
+    else if (rightTableDef) {
+        const rightColumns = rightTableDef.$columns || rightTableDef;
+        selectColumns = Object.entries(rightColumns)
+            .filter(([_, colDef]) => colDef && typeof colDef === 'object' && '$type' in colDef)
+            .map(([propName, colDef]) => ({
+            property: propName,
+            sqlName: colDef.$columnName || toSnake(propName),
+        }));
+    }
     const joinClause = {
         type: joinType,
         table: rightTableName,

package/dist/esm/core/shared/column-mapping.js

@@ -17,7 +17,7 @@ export function buildColumnMappings(schema, mappings, debugLog) {
         const propToFields = new Map();
         for (const [propName, colDef] of Object.entries(columns)) {
             const dbColName = colDef?.$columnName ?? propName;
-            const colType = colDef?.$type ?? 'TEXT';
+            const colType = colDef?.$sqlType || (typeof colDef?.$type === 'string' ? colDef.$type : undefined) || 'TEXT';
             propToDb.set(propName, dbColName);
             dbToProp.set(dbColName, propName);
             propToType.set(propName, colType);

package/dist/esm/core/shared/transform.js

@@ -18,8 +18,12 @@ export function buildColumnTypeMap(tableDef) {
     const typeMap = new Map();
     const columns = tableDef.$columns || tableDef;
     for (const [key, colDef] of Object.entries(columns)) {
-        if (colDef && typeof colDef === 'object' && '$type' in colDef) {
-            typeMap.set(key, colDef.$type);
+        if (colDef && typeof colDef === 'object') {
+            const col = colDef;
+            const sqlType = col.$sqlType || (typeof col.$type === 'string' ? col.$type : undefined);
+            if (sqlType) {
+                typeMap.set(key, sqlType);
+            }
         }
     }
     return typeMap;

package/dist/esm/schema-definition/pg-schema/column-types/column-builder.js

@@ -146,7 +146,7 @@ export function createColumn(type) {
             config.$length = len;
             const baseType = config.$type.replace(/\(\d+\)/, '');
             config.$type = `${baseType}(${len})`;
-            return Object.assign(this, { $length: len, $type: config.$type });
+            return Object.assign(this, { $length: len, $type: config.$type, $sqlType: config.$type });
         },
         precision(p) {
             config.$precision = p;
@@ -154,7 +154,7 @@ export function createColumn(type) {
             config.$type = config.$scale !== undefined
                 ? `${base}(${p}, ${config.$scale})`
                 : `${base}(${p})`;
-            return Object.assign(this, { $precision: p, $type: config.$type });
+            return Object.assign(this, { $precision: p, $type: config.$type, $sqlType: config.$type });
         },
         scale(s) {
             config.$scale = s;
@@ -162,7 +162,7 @@ export function createColumn(type) {
             config.$type = config.$precision !== undefined
                 ? `${base}(${config.$precision}, ${s})`
                 : `${base}(38, ${s})`;
-            return Object.assign(this, { $scale: s, $type: config.$type });
+            return Object.assign(this, { $scale: s, $type: config.$type, $sqlType: config.$type });
         },
         withTimezone() {
             config.$withTimezone = true;
@@ -172,12 +172,12 @@ export function createColumn(type) {
             else if (config.$type === 'TIME') {
                 config.$type = 'TIMETZ';
             }
-            return Object.assign(this, { $withTimezone: true, $type: config.$type });
+            return Object.assign(this, { $withTimezone: true, $type: config.$type, $sqlType: config.$type });
         },
         dimensions(d) {
             config.$dimensions = d;
             config.$type = `VECTOR(${d})`;
-            return Object.assign(this, { $dimensions: d, $type: config.$type });
+            return Object.assign(this, { $dimensions: d, $type: config.$type, $sqlType: config.$type });
         },
         comment(text) {
             config.$comment = text;

package/dist/esm/schema-definition/pg-schema/column-types/custom-types.js

@@ -9,7 +9,7 @@ export function pgComposite(name, fields) {
         const config = fieldConfig;
         return {
             name: fieldName,
-            type: config.$type,
+            type: config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT'),
             collation: undefined,
         };
     });
@@ -37,7 +37,7 @@ export function generateCompositeTypeSQL(composite) {
     const fieldDefs = [];
     for (const [fieldName, fieldConfig] of Object.entries(composite.$fields)) {
         const config = fieldConfig;
-        let fieldDef = `"${fieldName}" ${config.$type}`;
+        let fieldDef = `"${fieldName}" ${config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT')}`;
         if (config.$nullable === false) {
             fieldDef += ' NOT NULL';
         }

package/dist/esm/schema-definition/pg-schema/column-types/domain-types.js

@@ -135,8 +135,8 @@ function createDomainValueExpr() {
     };
 }
 export function pgDomain(name, baseType, checks) {
-    const config = baseType.$config;
-    const baseTypeStr = config?.$type || 'TEXT';
+    const bt = baseType;
+    const baseTypeStr = bt.$sqlType || (typeof bt.$type === 'string' ? bt.$type : null) || 'TEXT';
     const constraints = [];
     let validateFn;
     if (checks) {
@@ -159,8 +159,8 @@ export function pgDomain(name, baseType, checks) {
             }
         }
     }
-    const notNull = config?.$nullable === false;
-    const defaultValue = config?.$default;
+    const notNull = bt?.$nullable === false;
+    const defaultValue = bt?.$default;
     const domainFn = (columnName) => {
         const col = createColumnWithName(name, columnName);
         if (validateFn) {

package/dist/esm/schema-definition/pg-schema/pg-enum.js

@@ -2,6 +2,7 @@ export function pgEnum(name, values) {
     const config = function (columnName) {
         const col = {
             $type: name,
+            $sqlType: name,
             $enumName: name,
             $checkValues: values,
         };
@@ -32,7 +33,8 @@ export function pgEnum(name, values) {
             array() {
                 col.$array = true;
                 col.$type = `${name}[]`;
-                return Object.assign(this, { $array: true, $type: `${name}[]` });
+                col.$sqlType = `${name}[]`;
+                return Object.assign(this, { $array: true, $type: `${name}[]`, $sqlType: `${name}[]` });
             },
             $id(trackingId) {
                 col.$trackingId = trackingId;

package/dist/esm/schema-definition/pg-schema/schema-builder.js

@@ -17,7 +17,7 @@ function createTableProxy(name, columns, tableDef) {
     for (const [colKey, colDef] of Object.entries(columns)) {
         const config = colDef.$config || colDef;
         const sqlName = config.$sqlName || config.$columnName || colKey;
-        const colType = config.$sqlType || config.$type || 'unknown';
+        const colType = config.$sqlType || (typeof config.$type === 'string' ? config.$type : undefined) || 'unknown';
         proxy[colKey] = {
             $table: name,
             $column: sqlName,

package/dist/esm/schema-definition/pg-schema/table-definition/sql-generation.js

@@ -105,7 +105,7 @@ export function generateCreateTableSQL(def) {
 export function generateColumnSQL(name, config) {
     const actualName = config.$columnName || name;
     const parts = [format.ident(actualName)];
-    let typeName = config.$type;
+    let typeName = config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT');
     if (config.$array) {
         const dims = config.$dimensions ?? 1;
         typeName += '[]'.repeat(dims);

package/dist/esm/schema-definition/pg-schema/validate-schema/validators.js

@@ -73,7 +73,7 @@ function validateTable(table, tableName, features, errors, warnings, info, allow
     validateTableFeatures(table, tableName, features, errors, warnings);
 }
 function validateColumn(column, location, features, errors, warnings, allowedCustomTypes) {
-    const colType = column.$type || column.$sqlType || 'unknown';
+    const colType = column.$sqlType || (typeof column.$type === 'string' ? column.$type : undefined) || 'unknown';
     if (allowedCustomTypes.includes(colType.toUpperCase())) {
         return;
     }

package/dist/esm/schema-definition/sqlite-schema/table-definition/ast-generation.js

@@ -14,7 +14,7 @@ function extractDefaultValue(col) {
     return undefined;
 }
 function resolveColumnType(col) {
-    const base = col.$sqlType || col.$type || 'TEXT';
+    const base = col.$sqlType || (typeof col.$type === 'string' ? col.$type : null) || 'TEXT';
     if (col.$length !== undefined) {
         return `${base}(${col.$length})`;
     }

package/dist/esm/schema-definition/sqlite-schema/table-definition/sql-generation.js

@@ -27,7 +27,7 @@ function formatDefault(col) {
 }
 function generateColumnSQL(name, col) {
     const parts = [quoteSQLiteIdentifier(col.$columnName || name)];
-    parts.push(col.$type || 'TEXT');
+    parts.push(col.$sqlType || (typeof col.$type === 'string' ? col.$type : null) || 'TEXT');
     if (col.$primaryKey) {
         parts.push('PRIMARY KEY');
         if (col.$autoincrement) {

package/dist/esm/schema-definition/sqlite-schema/table-definition/table-core.js

@@ -11,7 +11,7 @@ export function sqliteTable(name, columns, options) {
     for (const [colName, colConfig] of Object.entries(columns)) {
         const col = colConfig;
         if (col.$autoincrement) {
-            const sqlType = (col.$sqlType || col.$type || '').toUpperCase();
+            const sqlType = (col.$sqlType || (typeof col.$type === 'string' ? col.$type : '') || '').toUpperCase();
             if (sqlType !== 'INTEGER' || !col.$primaryKey) {
                 throw new Error(`[sqliteTable] AUTOINCREMENT on column "${colName}" in table "${name}" ` +
                     `requires INTEGER PRIMARY KEY. Got type "${sqlType}", primaryKey=${col.$primaryKey}.`);

package/dist/esm/utils/type-coercion.js

@@ -48,7 +48,8 @@ export function deserializeRow(row, schema) {
     const columnMap = new Map();
     for (const [key, config] of Object.entries(schema)) {
         const dbColumnName = config.$columnName || key;
-        columnMap.set(dbColumnName, { key, type: config.$type });
+        const sqlType = config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT');
+        columnMap.set(dbColumnName, { key, type: sqlType });
     }
     for (const [dbColumn, value] of Object.entries(row)) {
         const mapping = columnMap.get(dbColumn);
@@ -94,7 +95,8 @@ export function serializeRow(row, schema) {
     for (const [key, value] of Object.entries(row)) {
         const config = schema[key];
         if (config) {
-            result[key] = serializeValue(value, config.$type);
+            const sqlType = config.$sqlType || (typeof config.$type === 'string' ? config.$type : 'TEXT');
+            result[key] = serializeValue(value, sqlType);
         }
         else {
             result[key] = value;

package/dist/index.d.ts

@@ -8744,6 +8744,12 @@ declare class ConnectedSelectBuilder<TSchema = any, TTable = any, TColumns exten
 	 * @internal
 	 */
 	private transformNestedObject;
+	/**
+	 * Coerce a JSON-serialized value back to its proper JS type.
+	 * row_to_json() serializes timestamps as strings and bigints as numbers.
+	 * @internal
+	 */
+	private coerceValue;
 	where(callback: (q: TypedConditionBuilder<TTable>) => TypedConditionBuilder<TTable>): this;
 	orderBy(column: ColumnName<TTable>, direction?: "ASC" | "DESC"): this;
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",