litedbmodel 2.2.6 → 2.2.8

package/dist/index.cjs

@@ -1158,14 +1158,14 @@ __export(index_exports, {
   _legacyOr: () => or,
   and: () => and,
   belongsTo: () => belongsTo,
-  castToBoolean: () => castToBoolean,
-  castToBooleanArray: () => castToBooleanArray,
-  castToDatetime: () => castToDatetime,
-  castToDatetimeArray: () => castToDatetimeArray,
-  castToIntegerArray: () => castToIntegerArray,
-  castToJson: () => castToJson,
-  castToNumericArray: () => castToNumericArray,
-  castToStringArray: () => castToStringArray,
+  castToBoolean: () => castToBoolean2,
+  castToBooleanArray: () => castToBooleanArray2,
+  castToDatetime: () => castToDatetime2,
+  castToDatetimeArray: () => castToDatetimeArray2,
+  castToIntegerArray: () => castToIntegerArray2,
+  castToJson: () => castToJson2,
+  castToNumericArray: () => castToNumericArray2,
+  castToStringArray: () => castToStringArray2,
   closeAllPools: () => closeAllPools2,
   column: () => column,
   columnsToNames: () => columnsToNames,
@@ -1595,6 +1595,166 @@ var defaultLogger = {
   error: console.error
 };
 
+// src/drivers/PostgresHelper.ts
+function castToDatetime(val) {
+  if (val === null || val === void 0) {
+    return null;
+  }
+  if (val instanceof Date) {
+    return val;
+  }
+  if (typeof val === "string" || typeof val === "number") {
+    const date = new Date(val);
+    return isNaN(date.getTime()) ? null : date;
+  }
+  return null;
+}
+function castToBoolean(val) {
+  if (val === null || val === void 0) {
+    return null;
+  }
+  if (typeof val === "boolean") {
+    return val;
+  }
+  if (typeof val === "string") {
+    const lower = val.toLowerCase();
+    if (lower === "true" || lower === "t" || lower === "1") {
+      return true;
+    }
+    if (lower === "false" || lower === "f" || lower === "0") {
+      return false;
+    }
+  }
+  if (typeof val === "number") {
+    return val !== 0;
+  }
+  return null;
+}
+function castToIntegerArray(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => {
+      if (typeof v === "number") return v;
+      const n = parseInt(String(v), 10);
+      return isNaN(n) ? 0 : n;
+    });
+  }
+  if (typeof val === "string") {
+    return pgArrayParse(val).map((v) => {
+      const n = parseInt(v, 10);
+      return isNaN(n) ? 0 : n;
+    });
+  }
+  return [];
+}
+function castToNumericArray(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => {
+      if (v === null || v === void 0) return null;
+      if (typeof v === "number") return v;
+      const n = parseFloat(String(v));
+      return isNaN(n) ? null : n;
+    });
+  }
+  if (typeof val === "string") {
+    return pgArrayParse(val).map((v) => {
+      if (v === "NULL" || v === "") return null;
+      const n = parseFloat(v);
+      return isNaN(n) ? null : n;
+    });
+  }
+  return [];
+}
+function castToStringArray(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => String(v));
+  }
+  if (typeof val === "string") {
+    return pgArrayParse(val);
+  }
+  return [];
+}
+function castToBooleanArray(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => castToBoolean(v));
+  }
+  if (typeof val === "string") {
+    return pgArrayParse(val).map((v) => castToBoolean(v));
+  }
+  return [];
+}
+function castToDatetimeArray(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => castToDatetime(v));
+  }
+  if (typeof val === "string") {
+    return pgArrayParse(val).map((v) => castToDatetime(v));
+  }
+  return [];
+}
+function castToJson(val) {
+  return val ?? null;
+}
+function pgArrayParse(literal) {
+  if (!literal || literal === "{}") {
+    return [];
+  }
+  let content = literal.trim();
+  if (content.startsWith("{") && content.endsWith("}")) {
+    content = content.slice(1, -1);
+  }
+  if (content === "") {
+    return [];
+  }
+  const result = [];
+  let current = "";
+  let inQuotes = false;
+  let escaped = false;
+  for (let i = 0; i < content.length; i++) {
+    const char = content[i];
+    if (escaped) {
+      current += char;
+      escaped = false;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (char === '"') {
+      inQuotes = !inQuotes;
+      continue;
+    }
+    if (char === "," && !inQuotes) {
+      result.push(current);
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  if (current !== "" || result.length > 0) {
+    result.push(current);
+  }
+  return result;
+}
+function formatSqlCast(placeholder, sqlCast) {
+  return `${placeholder}::${sqlCast}`;
+}
+
 // src/TypeCast.ts
 var defaultTypeCast = {
   castToDatetime(val) {
@@ -1719,17 +1879,15 @@ var defaultTypeCast = {
     }
     return [];
   },
+  // A string is JSON text to decode; any other value is already a JSON value
   castToJson(val) {
     if (val === null || val === void 0) return null;
-    if (typeof val === "object") return val;
-    if (typeof val === "string") {
-      try {
-        return JSON.parse(val);
-      } catch {
-        return null;
-      }
+    if (typeof val !== "string") return val;
+    try {
+      return JSON.parse(val);
+    } catch {
+      return null;
     }
-    return null;
   }
 };
 function parsePostgresArray(literal) {
@@ -1780,28 +1938,28 @@ function resetTypeCastImpl() {
 function getTypeCast() {
   return currentTypeCast;
 }
-function castToDatetime(val) {
+function castToDatetime2(val) {
   return currentTypeCast.castToDatetime(val);
 }
-function castToBoolean(val) {
+function castToBoolean2(val) {
   return currentTypeCast.castToBoolean(val);
 }
-function castToIntegerArray(val) {
+function castToIntegerArray2(val) {
   return currentTypeCast.castToIntegerArray(val);
 }
-function castToNumericArray(val) {
+function castToNumericArray2(val) {
   return currentTypeCast.castToNumericArray(val);
 }
-function castToStringArray(val) {
+function castToStringArray2(val) {
   return currentTypeCast.castToStringArray(val);
 }
-function castToBooleanArray(val) {
+function castToBooleanArray2(val) {
   return currentTypeCast.castToBooleanArray(val);
 }
-function castToDatetimeArray(val) {
+function castToDatetimeArray2(val) {
   return currentTypeCast.castToDatetimeArray(val);
 }
-function castToJson(val) {
+function castToJson2(val) {
   return currentTypeCast.castToJson(val);
 }
 function formatLocalDate(d) {
@@ -1845,16 +2003,7 @@ var postgresTypeCast = {
     return JSON.stringify(val);
   },
   deserializeJson(val) {
-    if (val === null || val === void 0) return null;
-    if (typeof val === "object") return val;
-    if (typeof val === "string") {
-      try {
-        return JSON.parse(val);
-      } catch {
-        return null;
-      }
-    }
-    return null;
+    return castToJson(val);
   },
   serializeBooleanArray(val) {
     if (val === null || val === void 0) return null;
@@ -2158,73 +2307,151 @@ var postgresSqlBuilder = {
   inferPgType
 };
 
-// src/drivers/MysqlSqlBuilder.ts
-var mysqlTypeCast = {
-  driverName: "mysql",
-  serializeArray(val) {
-    if (val === null || val === void 0) return null;
-    return JSON.stringify(val);
-  },
-  deserializeArray(val) {
-    if (val === null || val === void 0) return null;
-    if (Array.isArray(val)) return val;
-    if (typeof val === "string") {
-      try {
-        const parsed = JSON.parse(val);
-        return Array.isArray(parsed) ? parsed : null;
-      } catch {
-        return null;
-      }
-    }
-    return null;
-  },
-  serializeJson(val) {
-    if (val === null || val === void 0) return null;
-    return JSON.stringify(val);
-  },
-  deserializeJson(val) {
-    if (val === null || val === void 0) return null;
-    if (typeof val === "object") return val;
-    if (typeof val === "string") {
-      try {
-        return JSON.parse(val);
-      } catch {
-        return null;
-      }
-    }
-    return null;
-  },
-  serializeBooleanArray(val) {
-    if (val === null || val === void 0) return null;
-    return JSON.stringify(val);
-  },
-  deserializeBooleanArray(val) {
-    if (val === null || val === void 0) return null;
-    if (Array.isArray(val)) return val;
-    if (typeof val === "string") {
-      try {
-        const parsed = JSON.parse(val);
-        return Array.isArray(parsed) ? parsed : null;
-      } catch {
-        return null;
-      }
-    }
+// src/drivers/MysqlHelper.ts
+function castToDatetime3(val) {
+  if (val === null || val === void 0) {
     return null;
-  },
-  /**
-   * MySQL: return Date object as-is, let mysql2 driver handle conversion
-   * Note: MySQL DATETIME has no timezone - values stored/retrieved in server timezone
-   */
-  serializeDatetime(val) {
-    return val;
-  },
-  /**
-   * MySQL: return Date object as-is, let mysql2 driver handle conversion
-   */
-  serializeDate(val) {
+  }
+  if (val instanceof Date) {
     return val;
   }
-};
+  if (typeof val === "string" || typeof val === "number") {
+    const date = new Date(val);
+    return isNaN(date.getTime()) ? null : date;
+  }
+  return null;
+}
+function castToBoolean3(val) {
+  if (val === null || val === void 0) {
+    return null;
+  }
+  if (typeof val === "boolean") {
+    return val;
+  }
+  if (typeof val === "number") {
+    return val !== 0;
+  }
+  if (typeof val === "string") {
+    const lower = val.toLowerCase();
+    if (lower === "true" || lower === "1") {
+      return true;
+    }
+    if (lower === "false" || lower === "0") {
+      return false;
+    }
+  }
+  if (Buffer.isBuffer(val)) {
+    return val[0] !== 0;
+  }
+  return null;
+}
+function castToIntegerArray3(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => {
+      const n = parseInt(String(v), 10);
+      return isNaN(n) ? 0 : n;
+    });
+  }
+  if (typeof val === "string") {
+    try {
+      const parsed = JSON.parse(val);
+      if (Array.isArray(parsed)) {
+        return parsed.map((v) => {
+          const n = parseInt(String(v), 10);
+          return isNaN(n) ? 0 : n;
+        });
+      }
+    } catch {
+    }
+  }
+  return [];
+}
+function castToStringArray3(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => String(v));
+  }
+  if (typeof val === "string") {
+    try {
+      const parsed = JSON.parse(val);
+      if (Array.isArray(parsed)) {
+        return parsed.map((v) => String(v));
+      }
+    } catch {
+    }
+  }
+  return [];
+}
+function castToJson3(val) {
+  return val ?? null;
+}
+function formatSqlCast2(placeholder, _sqlCast) {
+  return placeholder;
+}
+
+// src/drivers/MysqlSqlBuilder.ts
+var mysqlTypeCast = {
+  driverName: "mysql",
+  serializeArray(val) {
+    if (val === null || val === void 0) return null;
+    return JSON.stringify(val);
+  },
+  deserializeArray(val) {
+    if (val === null || val === void 0) return null;
+    if (Array.isArray(val)) return val;
+    if (typeof val === "string") {
+      try {
+        const parsed = JSON.parse(val);
+        return Array.isArray(parsed) ? parsed : null;
+      } catch {
+        return null;
+      }
+    }
+    return null;
+  },
+  serializeJson(val) {
+    if (val === null || val === void 0) return null;
+    return JSON.stringify(val);
+  },
+  deserializeJson(val) {
+    return castToJson3(val);
+  },
+  serializeBooleanArray(val) {
+    if (val === null || val === void 0) return null;
+    return JSON.stringify(val);
+  },
+  deserializeBooleanArray(val) {
+    if (val === null || val === void 0) return null;
+    if (Array.isArray(val)) return val;
+    if (typeof val === "string") {
+      try {
+        const parsed = JSON.parse(val);
+        return Array.isArray(parsed) ? parsed : null;
+      } catch {
+        return null;
+      }
+    }
+    return null;
+  },
+  /**
+   * MySQL: return Date object as-is, let mysql2 driver handle conversion
+   * Note: MySQL DATETIME has no timezone - values stored/retrieved in server timezone
+   */
+  serializeDatetime(val) {
+    return val;
+  },
+  /**
+   * MySQL: return Date object as-is, let mysql2 driver handle conversion
+   */
+  serializeDate(val) {
+    return val;
+  }
+};
 var mysqlSqlBuilder = {
   driverType: "mysql",
   typeCast: mysqlTypeCast,
@@ -2360,6 +2587,103 @@ var mysqlSqlBuilder = {
   }
 };
 
+// src/drivers/SqliteHelper.ts
+function castToDatetime4(val) {
+  if (val === null || val === void 0) {
+    return null;
+  }
+  if (val instanceof Date) {
+    return val;
+  }
+  if (typeof val === "string" || typeof val === "number") {
+    const date = new Date(val);
+    return isNaN(date.getTime()) ? null : date;
+  }
+  return null;
+}
+function castToBoolean4(val) {
+  if (val === null || val === void 0) {
+    return null;
+  }
+  if (typeof val === "boolean") {
+    return val;
+  }
+  if (typeof val === "number") {
+    return val !== 0;
+  }
+  if (typeof val === "string") {
+    const lower = val.toLowerCase();
+    if (lower === "true" || lower === "1") {
+      return true;
+    }
+    if (lower === "false" || lower === "0") {
+      return false;
+    }
+  }
+  return null;
+}
+function castToIntegerArray4(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => {
+      const n = parseInt(String(v), 10);
+      return isNaN(n) ? 0 : n;
+    });
+  }
+  if (typeof val === "string") {
+    try {
+      const parsed = JSON.parse(val);
+      if (Array.isArray(parsed)) {
+        return parsed.map((v) => {
+          const n = parseInt(String(v), 10);
+          return isNaN(n) ? 0 : n;
+        });
+      }
+    } catch {
+    }
+  }
+  return [];
+}
+function castToStringArray4(val) {
+  if (val === null || val === void 0) {
+    return [];
+  }
+  if (Array.isArray(val)) {
+    return val.map((v) => String(v));
+  }
+  if (typeof val === "string") {
+    try {
+      const parsed = JSON.parse(val);
+      if (Array.isArray(parsed)) {
+        return parsed.map((v) => String(v));
+      }
+    } catch {
+    }
+  }
+  return [];
+}
+function castToJson4(val) {
+  if (val === null || val === void 0) {
+    return null;
+  }
+  if (typeof val === "object" || typeof val === "number") {
+    return val;
+  }
+  if (typeof val === "string") {
+    try {
+      return JSON.parse(val);
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+function formatSqlCast3(placeholder, _sqlCast) {
+  return placeholder;
+}
+
 // src/drivers/SqliteSqlBuilder.ts
 var sqliteTypeCast = {
   driverName: "sqlite",
@@ -2385,16 +2709,7 @@ var sqliteTypeCast = {
     return JSON.stringify(val);
   },
   deserializeJson(val) {
-    if (val === null || val === void 0) return null;
-    if (typeof val === "object") return val;
-    if (typeof val === "string") {
-      try {
-        return JSON.parse(val);
-      } catch {
-        return null;
-      }
-    }
-    return null;
+    return castToJson4(val);
   },
   serializeBooleanArray(val) {
     if (val === null || val === void 0) return null;
@@ -3551,436 +3866,66 @@ var MysqlDriver = class {
                 const [selectResult] = await conn.query(selectSql, [insertId, insertId + affectedRows]);
                 const rows2 = selectResult;
                 this.logger.debug(`Retry succeeded in ${duration}ms, rows: ${rows2.length}`);
-                return {
-                  rows: rows2,
-                  rowCount: rows2.length
-                };
-              }
-            }
-          }
-          const resultObj = result;
-          const rowCount = resultObj.affectedRows ?? 0;
-          const rows = Array.isArray(result) ? result : [];
-          this.logger.debug(`Retry succeeded in ${duration}ms, affected: ${rowCount}`);
-          return {
-            rows,
-            rowCount
-          };
-        } catch (retryError) {
-          this.logger.error(`Retry also failed: ${sqlWithoutReturning}`, retryError);
-          throw retryError;
-        }
-      }
-      this.logger.error(`Write failed: ${sqlWithoutReturning}`, error);
-      throw error;
-    }
-  }
-  /**
-   * Get a connection for transaction (uses writer pool if available)
-   */
-  async getConnection() {
-    const pool = this.writerPool || this.pool;
-    const connection = await pool.getConnection();
-    return new MysqlConnection(connection, this.logger);
-  }
-  /**
-   * Close all connections
-   */
-  async close() {
-    await closePool2(this.config);
-    if (this.writerConfig) {
-      await closePool2(this.writerConfig);
-    }
-  }
-  /**
-   * Set logger
-   */
-  setLogger(logger) {
-    this.logger = logger;
-  }
-  /**
-   * Get the underlying pool (for advanced use)
-   */
-  getPool() {
-    return this.pool;
-  }
-  /**
-   * Get the underlying writer pool
-   */
-  getWriterPool() {
-    return this.writerPool;
-  }
-};
-
-// src/drivers/PostgresHelper.ts
-function castToDatetime2(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (val instanceof Date) {
-    return val;
-  }
-  if (typeof val === "string" || typeof val === "number") {
-    const date = new Date(val);
-    return isNaN(date.getTime()) ? null : date;
-  }
-  return null;
-}
-function castToBoolean2(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (typeof val === "boolean") {
-    return val;
-  }
-  if (typeof val === "string") {
-    const lower = val.toLowerCase();
-    if (lower === "true" || lower === "t" || lower === "1") {
-      return true;
-    }
-    if (lower === "false" || lower === "f" || lower === "0") {
-      return false;
-    }
-  }
-  if (typeof val === "number") {
-    return val !== 0;
-  }
-  return null;
-}
-function castToIntegerArray2(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => {
-      if (typeof v === "number") return v;
-      const n = parseInt(String(v), 10);
-      return isNaN(n) ? 0 : n;
-    });
-  }
-  if (typeof val === "string") {
-    return pgArrayParse(val).map((v) => {
-      const n = parseInt(v, 10);
-      return isNaN(n) ? 0 : n;
-    });
-  }
-  return [];
-}
-function castToNumericArray2(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => {
-      if (v === null || v === void 0) return null;
-      if (typeof v === "number") return v;
-      const n = parseFloat(String(v));
-      return isNaN(n) ? null : n;
-    });
-  }
-  if (typeof val === "string") {
-    return pgArrayParse(val).map((v) => {
-      if (v === "NULL" || v === "") return null;
-      const n = parseFloat(v);
-      return isNaN(n) ? null : n;
-    });
-  }
-  return [];
-}
-function castToStringArray2(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => String(v));
-  }
-  if (typeof val === "string") {
-    return pgArrayParse(val);
-  }
-  return [];
-}
-function castToBooleanArray2(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => castToBoolean2(v));
-  }
-  if (typeof val === "string") {
-    return pgArrayParse(val).map((v) => castToBoolean2(v));
-  }
-  return [];
-}
-function castToDatetimeArray2(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => castToDatetime2(v));
-  }
-  if (typeof val === "string") {
-    return pgArrayParse(val).map((v) => castToDatetime2(v));
-  }
-  return [];
-}
-function castToJson2(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (typeof val === "object") {
-    return val;
-  }
-  if (typeof val === "string") {
-    try {
-      return JSON.parse(val);
-    } catch {
-      return null;
-    }
-  }
-  return null;
-}
-function pgArrayParse(literal) {
-  if (!literal || literal === "{}") {
-    return [];
-  }
-  let content = literal.trim();
-  if (content.startsWith("{") && content.endsWith("}")) {
-    content = content.slice(1, -1);
-  }
-  if (content === "") {
-    return [];
-  }
-  const result = [];
-  let current = "";
-  let inQuotes = false;
-  let escaped = false;
-  for (let i = 0; i < content.length; i++) {
-    const char = content[i];
-    if (escaped) {
-      current += char;
-      escaped = false;
-      continue;
-    }
-    if (char === "\\") {
-      escaped = true;
-      continue;
-    }
-    if (char === '"') {
-      inQuotes = !inQuotes;
-      continue;
-    }
-    if (char === "," && !inQuotes) {
-      result.push(current);
-      current = "";
-      continue;
-    }
-    current += char;
-  }
-  if (current !== "" || result.length > 0) {
-    result.push(current);
-  }
-  return result;
-}
-function formatSqlCast(placeholder, sqlCast) {
-  return `${placeholder}::${sqlCast}`;
-}
-
-// src/drivers/SqliteHelper.ts
-function castToDatetime3(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (val instanceof Date) {
-    return val;
-  }
-  if (typeof val === "string" || typeof val === "number") {
-    const date = new Date(val);
-    return isNaN(date.getTime()) ? null : date;
-  }
-  return null;
-}
-function castToBoolean3(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (typeof val === "boolean") {
-    return val;
-  }
-  if (typeof val === "number") {
-    return val !== 0;
-  }
-  if (typeof val === "string") {
-    const lower = val.toLowerCase();
-    if (lower === "true" || lower === "1") {
-      return true;
-    }
-    if (lower === "false" || lower === "0") {
-      return false;
-    }
-  }
-  return null;
-}
-function castToIntegerArray3(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => {
-      const n = parseInt(String(v), 10);
-      return isNaN(n) ? 0 : n;
-    });
-  }
-  if (typeof val === "string") {
-    try {
-      const parsed = JSON.parse(val);
-      if (Array.isArray(parsed)) {
-        return parsed.map((v) => {
-          const n = parseInt(String(v), 10);
-          return isNaN(n) ? 0 : n;
-        });
-      }
-    } catch {
-    }
-  }
-  return [];
-}
-function castToStringArray3(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => String(v));
-  }
-  if (typeof val === "string") {
-    try {
-      const parsed = JSON.parse(val);
-      if (Array.isArray(parsed)) {
-        return parsed.map((v) => String(v));
-      }
-    } catch {
-    }
-  }
-  return [];
-}
-function castToJson3(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (typeof val === "object") {
-    return val;
-  }
-  if (typeof val === "string") {
-    try {
-      return JSON.parse(val);
-    } catch {
-      return null;
-    }
-  }
-  return null;
-}
-function formatSqlCast2(placeholder, _sqlCast) {
-  return placeholder;
-}
-
-// src/drivers/MysqlHelper.ts
-function castToDatetime4(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (val instanceof Date) {
-    return val;
-  }
-  if (typeof val === "string" || typeof val === "number") {
-    const date = new Date(val);
-    return isNaN(date.getTime()) ? null : date;
-  }
-  return null;
-}
-function castToBoolean4(val) {
-  if (val === null || val === void 0) {
-    return null;
-  }
-  if (typeof val === "boolean") {
-    return val;
-  }
-  if (typeof val === "number") {
-    return val !== 0;
-  }
-  if (typeof val === "string") {
-    const lower = val.toLowerCase();
-    if (lower === "true" || lower === "1") {
-      return true;
-    }
-    if (lower === "false" || lower === "0") {
-      return false;
-    }
-  }
-  if (Buffer.isBuffer(val)) {
-    return val[0] !== 0;
-  }
-  return null;
-}
-function castToIntegerArray4(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => {
-      const n = parseInt(String(v), 10);
-      return isNaN(n) ? 0 : n;
-    });
-  }
-  if (typeof val === "string") {
-    try {
-      const parsed = JSON.parse(val);
-      if (Array.isArray(parsed)) {
-        return parsed.map((v) => {
-          const n = parseInt(String(v), 10);
-          return isNaN(n) ? 0 : n;
-        });
+                return {
+                  rows: rows2,
+                  rowCount: rows2.length
+                };
+              }
+            }
+          }
+          const resultObj = result;
+          const rowCount = resultObj.affectedRows ?? 0;
+          const rows = Array.isArray(result) ? result : [];
+          this.logger.debug(`Retry succeeded in ${duration}ms, affected: ${rowCount}`);
+          return {
+            rows,
+            rowCount
+          };
+        } catch (retryError) {
+          this.logger.error(`Retry also failed: ${sqlWithoutReturning}`, retryError);
+          throw retryError;
+        }
       }
-    } catch {
+      this.logger.error(`Write failed: ${sqlWithoutReturning}`, error);
+      throw error;
     }
   }
-  return [];
-}
-function castToStringArray4(val) {
-  if (val === null || val === void 0) {
-    return [];
-  }
-  if (Array.isArray(val)) {
-    return val.map((v) => String(v));
+  /**
+   * Get a connection for transaction (uses writer pool if available)
+   */
+  async getConnection() {
+    const pool = this.writerPool || this.pool;
+    const connection = await pool.getConnection();
+    return new MysqlConnection(connection, this.logger);
   }
-  if (typeof val === "string") {
-    try {
-      const parsed = JSON.parse(val);
-      if (Array.isArray(parsed)) {
-        return parsed.map((v) => String(v));
-      }
-    } catch {
+  /**
+   * Close all connections
+   */
+  async close() {
+    await closePool2(this.config);
+    if (this.writerConfig) {
+      await closePool2(this.writerConfig);
     }
   }
-  return [];
-}
-function castToJson4(val) {
-  if (val === null || val === void 0) {
-    return null;
+  /**
+   * Set logger
+   */
+  setLogger(logger) {
+    this.logger = logger;
   }
-  if (typeof val === "object") {
-    return val;
+  /**
+   * Get the underlying pool (for advanced use)
+   */
+  getPool() {
+    return this.pool;
   }
-  if (typeof val === "string") {
-    try {
-      return JSON.parse(val);
-    } catch {
-      return null;
-    }
+  /**
+   * Get the underlying writer pool
+   */
+  getWriterPool() {
+    return this.writerPool;
   }
-  return null;
-}
-function formatSqlCast3(placeholder, _sqlCast) {
-  return placeholder;
-}
+};
 
 // src/drivers/index.ts
 function getSqlBuilder(driverType) {
@@ -4003,9 +3948,9 @@ function getSqlCastFormatter(driverType) {
     case "postgres":
       return (placeholder, sqlType) => formatSqlCast(placeholder, sqlType);
     case "sqlite":
-      return (placeholder, sqlType) => formatSqlCast2(placeholder, sqlType);
-    case "mysql":
       return (placeholder, sqlType) => formatSqlCast3(placeholder, sqlType);
+    case "mysql":
+      return (placeholder, sqlType) => formatSqlCast2(placeholder, sqlType);
     default:
       return (placeholder) => placeholder;
   }
@@ -5344,7 +5289,7 @@ function orderToString(order) {
   }
   return order.toString();
 }
-function createColumn(columnName, tableName, modelName, propertyName, sqlCast) {
+function createColumn(columnName, tableName, modelName, propertyName, sqlCast, serialize) {
   const fn = function() {
     return columnName;
   };
@@ -5379,6 +5324,11 @@ function createColumn(columnName, tableName, modelName, propertyName, sqlCast) {
     writable: false,
     enumerable: true
   });
+  Object.defineProperty(fn, "serialize", {
+    value: serialize,
+    writable: false,
+    enumerable: false
+  });
   if (sqlCast) {
     fn.eq = (value) => ({ [columnName]: new DBCast(value, sqlCast, "=") });
     fn.ne = (value) => ({ [columnName]: new DBCast(value, sqlCast, "!=") });
@@ -5525,7 +5475,12 @@ function createOrCond(condGroups) {
 function isOrCond(cond) {
   return typeof cond === "object" && cond !== null && "_type" in cond && cond._type === "or";
 }
-function condToKeyValue(cond) {
+function serializeCondValue(col, value, typeCast) {
+  const serialize = col.serialize;
+  if (serialize === void 0) return value;
+  return Array.isArray(value) ? value.map((v) => serialize(v, typeCast)) : serialize(value, typeCast);
+}
+function condToKeyValue(cond, typeCast) {
   if (cond.length === 1) {
     return [cond[0], true];
   }
@@ -5535,7 +5490,7 @@ function condToKeyValue(cond) {
   }
   if (Array.isArray(keyOrCol)) {
     const columns = keyOrCol;
-    const tuples = value;
+    const tuples = value.map((t) => t.map((v, i) => serializeCondValue(columns[i], v, typeCast)));
     const columnNames = columns.map((col2) => col2.columnName);
     return ["__tuple__", dbTupleIn(columnNames, tuples)];
   }
@@ -5550,13 +5505,14 @@ function condToKeyValue(cond) {
   if (value instanceof DBToken) {
     return [col.columnName, value];
   }
+  const bound = serializeCondValue(col, value, typeCast);
   if (sqlCast) {
-    if (Array.isArray(value)) {
-      return [col.columnName, new DBCastArray(value, sqlCast)];
+    if (Array.isArray(bound)) {
+      return [col.columnName, new DBCastArray(bound, sqlCast)];
     }
-    return [col.columnName, new DBCast(value, sqlCast, "=")];
+    return [col.columnName, new DBCast(bound, sqlCast, "=")];
   }
-  return [col.columnName, value];
+  return [col.columnName, bound];
 }
 function sqlFragmentToKeyValue(frag) {
   if (frag.params.length === 0) {
@@ -5567,14 +5523,14 @@ function sqlFragmentToKeyValue(frag) {
   }
   return [frag.sql, [...frag.params]];
 }
-function condsToRecord(conditions) {
+function condsToRecord(conditions, typeCast) {
   const result = {};
   for (const cond of conditions) {
     if (cond === SKIP) {
       continue;
     }
     if (isOrCond(cond)) {
-      const orGroups = cond.conditions.map((group) => condsToRecord(group));
+      const orGroups = cond.conditions.map((group) => condsToRecord(group, typeCast));
       result["__or__"] = orGroups;
     } else if (isAnySqlFragment(cond)) {
       const kv = sqlFragmentToKeyValue(cond);
@@ -5583,7 +5539,7 @@ function condsToRecord(conditions) {
         result[key] = value;
       }
     } else {
-      const kv = condToKeyValue(cond);
+      const kv = condToKeyValue(cond, typeCast);
       if (kv === null) continue;
       const [key, value] = kv;
       result[key] = value;
@@ -5632,12 +5588,14 @@ function resolvePgArrayCast(sql2, values) {
 function encodeJsonArrayParam(dialect, values) {
   return encodeJsonParam(dialect, values);
 }
+var BIGINT_SENTINEL = "\0int:";
 function encodeJsonParam(dialect, payload) {
-  return JSON.stringify(payload, (_key, v) => {
-    if (typeof v === "bigint") return Number(v);
+  const tagged = JSON.stringify(payload, (_key, v) => {
+    if (typeof v === "bigint") return `${BIGINT_SENTINEL}${v.toString()}`;
     if (dialect === "mysql" && typeof v === "boolean") return v ? 1 : 0;
     return v;
   });
+  return tagged.replace(/"\\u0000int:(-?\d+)"/g, "$1");
 }
 
 // src/scp/makesql/json-batch.ts
@@ -5799,8 +5757,8 @@ function sqlTypeToMaterializeClass(sqlType) {
     return "passthrough";
   }
   switch (t) {
-    // 32-bit int family: JS number holds the full range exactly. The PostgreSQL SERIAL family maps to
-    // its underlying int width (SERIAL/SERIAL4=int4, SMALLSERIAL/SERIAL2=int2).
+    // Integer family. The PostgreSQL SERIAL types are the same integers under an auto-increment
+    // default (SERIAL/SERIAL4=int4, SMALLSERIAL/SERIAL2=int2, BIGSERIAL/SERIAL8=int8).
     case "INTEGER":
     case "INT":
     case "SMALLINT":
@@ -5812,13 +5770,11 @@ function sqlTypeToMaterializeClass(sqlType) {
     case "SERIAL4":
     case "SMALLSERIAL":
     case "SERIAL2":
-      return "int32";
-    // 64-bit int: needs JS bigint for exactness.
     case "BIGINT":
     case "INT8":
     case "BIGSERIAL":
     case "SERIAL8":
-      return "int64";
+      return "int";
     case "BOOLEAN":
     case "BOOL":
       return "bool";
@@ -5853,31 +5809,33 @@ function sqlTypeToMaterializeClass(sqlType) {
       );
   }
 }
+var I64_MIN2 = -(2n ** 63n);
+var I64_MAX2 = 2n ** 63n - 1n;
+function checkI642(v) {
+  if (v < I64_MIN2 || v > I64_MAX2) {
+    throw new Error(`materialize int: ${v} is outside the i64 range behavior-contracts' \`int\` admits`);
+  }
+  return v;
+}
 function materializeCell(value, klass) {
   if (value === null || value === void 0) return value;
   switch (klass) {
-    case "int64": {
-      if (typeof value === "bigint") return value.toString();
+    case "int": {
+      if (typeof value === "bigint") return checkI642(value);
       if (typeof value === "string") {
-        if (!/^-?\d+$/.test(value)) throw new Error(`materialize int64: driver returned a non-integer string '${value}'`);
-        return value;
+        if (!/^-?\d+$/.test(value)) throw new Error(`materialize int: driver returned a non-integer string '${value}'`);
+        return checkI642(BigInt(value));
       }
       if (typeof value === "number") {
-        if (!Number.isInteger(value)) throw new Error(`materialize int64: driver returned a non-integer number ${value} for a 64-bit int column`);
+        if (!Number.isInteger(value)) throw new Error(`materialize int: driver returned a non-integer number ${value} for an integer column`);
         if (!Number.isSafeInteger(value)) {
           throw new Error(
-            `materialize int64: driver returned an UNSAFE JS number ${value} for a 64-bit int column \u2014 precision was already lost before materialization (the driver must return int8 as string/bigint, not a rounded double). Configure the driver (better-sqlite3 safeIntegers / mysql2 supportBigNumbers+bigNumberStrings / pg int8-as-string).`
+            `materialize int: driver returned an UNSAFE JS number ${value} for an integer column \u2014 precision was already lost before materialization (the driver must return integers as bigint/string, not a rounded double). Configure the driver (better-sqlite3 safeIntegers / mysql2 supportBigNumbers+bigNumberStrings / pg int-as-bigint).`
           );
         }
-        return value.toString();
+        return BigInt(value);
       }
-      throw new Error(`materialize int64: unexpected driver JS type ${typeof value}`);
-    }
-    case "int32": {
-      if (typeof value === "number") return value;
-      if (typeof value === "bigint") return Number(value);
-      if (typeof value === "string" && /^-?\d+$/.test(value)) return Number(value);
-      throw new Error(`materialize int32: unexpected driver JS type ${typeof value} (${String(value)})`);
+      throw new Error(`materialize int: unexpected driver JS type ${typeof value}`);
     }
     case "date": {
       if (typeof value === "string") return value;
@@ -6376,133 +6334,131 @@ function compileCreateManyBundle(name, options, dialectName = "sqlite", resolveC
 var import_reflect_metadata = __toESM(require_Reflect());
 var COLUMNS_KEY = /* @__PURE__ */ Symbol("litedbmodel:columns");
 var RELATIONS_KEY = /* @__PURE__ */ Symbol("litedbmodel:relations");
-function inferTypeCastFromDesignType(target, propertyKey) {
-  const designType = Reflect.getMetadata("design:type", target, propertyKey);
-  if (!designType) return void 0;
-  switch (designType) {
-    case Boolean:
-      return {
-        // v2 read contract: BOOLEAN → boolean, via the shared materializer.
-        typeCast: (v) => {
-          if (v === void 0) return void 0;
-          return materializeCell(v, "bool");
-        },
-        sqlCast: "boolean"
-      };
-    case Date:
-      return {
-        typeCast: (v) => {
-          if (v === void 0) return void 0;
-          return materializeCell(v, "date");
-        },
-        // Delegate to driver-specific serializeDatetime
-        serialize: (val, typeCast) => {
-          if (val === null || val === void 0) return null;
-          if (val instanceof Date) {
-            return typeCast?.serializeDatetime(val) ?? val;
-          }
-          return val;
-        },
-        sqlCast: "timestamp"
-      };
-    case Number:
-      return {
-        typeCast: (v) => {
-          if (v === void 0) return void 0;
-          if (v === null) return null;
-          const n = Number(v);
-          return isNaN(n) ? null : n;
-        }
-      };
-    case BigInt:
-      return {
-        // v2 read contract: BIGINT/INT8 → EXACT decimal STRING (no i64 rounding, JSON-safe), via the
-        // shared materializer. NOTE: the TS field type stays `bigint` in existing models for source
-        // compat, but the VALUE is now the exact string — the whole point of the #9 realignment.
-        typeCast: (v) => {
-          if (v === void 0) return void 0;
-          return materializeCell(v, "int64");
-        },
-        sqlCast: "bigint"
-      };
-    // Array, Object, String, and other types require explicit specification
-    default:
-      return void 0;
+if (typeof Symbol === "function" && !Symbol.metadata) {
+  Object.defineProperty(Symbol, "metadata", {
+    value: /* @__PURE__ */ Symbol.for("Symbol.metadata"),
+    writable: false,
+    enumerable: false,
+    configurable: true
+  });
+}
+function isStandardContext(second) {
+  return typeof second === "object" && second !== null && typeof second.kind === "string";
+}
+function classMetadataBag(context, propertyKey) {
+  const bag = context.metadata;
+  if (bag === void 0) {
+    throw new Error(
+      `litedbmodel: the standard-decorator context for '${propertyKey}' carries no \`context.metadata\`. litedbmodel defines \`Symbol.metadata\` on import, which every current emit needs to create the bag \u2014 import litedbmodel (or 'litedbmodel/decorators') BEFORE the module that defines the model.`
+    );
   }
+  return bag;
 }
-function inferBaseSqlTypeFromDesignType(target, propertyKey) {
-  const designType = Reflect.getMetadata("design:type", target, propertyKey);
-  if (!designType) return void 0;
-  switch (designType) {
-    case String:
-      return "TEXT";
-    case Number:
-      return "INTEGER";
-    case Boolean:
-      return "BOOLEAN";
-    case Date:
-      return "TIMESTAMP";
-    case BigInt:
-      return "BIGINT";
-    default:
-      return void 0;
+function legacyColumnMap(constructor) {
+  const own = Reflect.getOwnMetadata(COLUMNS_KEY, constructor);
+  if (own !== void 0) return own;
+  const inherited = Reflect.getMetadata(COLUMNS_KEY, constructor);
+  const map = new Map(inherited);
+  Reflect.defineMetadata(COLUMNS_KEY, map, constructor);
+  return map;
+}
+function standardColumnMap(bag) {
+  if (!Object.prototype.hasOwnProperty.call(bag, COLUMNS_KEY)) {
+    bag[COLUMNS_KEY] = new Map(bag[COLUMNS_KEY]);
   }
+  return bag[COLUMNS_KEY];
 }
-function registerColumn(target, propertyKey, options) {
-  const constructor = target.constructor;
-  const columns = Reflect.getMetadata(COLUMNS_KEY, constructor) || /* @__PURE__ */ new Map();
-  let finalTypeCast = options.typeCast;
-  let finalSerialize = options.serialize;
-  let finalSqlCast = options.sqlCast;
-  if (!options.skipAutoInfer) {
-    const inferred = inferTypeCastFromDesignType(target, propertyKey);
-    if (inferred) {
-      if (!finalTypeCast) finalTypeCast = inferred.typeCast;
-      if (!finalSerialize) finalSerialize = inferred.serialize;
-      if (!finalSqlCast) finalSqlCast = inferred.sqlCast;
-    }
+function legacyRelationList(constructor) {
+  const own = Reflect.getOwnMetadata(RELATIONS_KEY, constructor);
+  if (own !== void 0) return own;
+  const inherited = Reflect.getMetadata(RELATIONS_KEY, constructor);
+  const list = inherited !== void 0 ? [...inherited] : [];
+  Reflect.defineMetadata(RELATIONS_KEY, list, constructor);
+  return list;
+}
+function standardRelationList(bag) {
+  if (!Object.prototype.hasOwnProperty.call(bag, RELATIONS_KEY)) {
+    const inherited = bag[RELATIONS_KEY];
+    bag[RELATIONS_KEY] = inherited !== void 0 ? [...inherited] : [];
   }
-  const baseSqlType = inferBaseSqlTypeFromDesignType(target, propertyKey);
+  return bag[RELATIONS_KEY];
+}
+function registerColumn(columns, propertyKey, options) {
   columns.set(propertyKey, {
     columnName: options.columnName,
-    typeCast: finalTypeCast,
-    serialize: finalSerialize,
+    typeCast: options.typeCast,
+    serialize: options.serialize,
     primaryKey: options.primaryKey,
     autoIncrement: options.autoIncrement,
-    sqlCast: finalSqlCast,
-    ...baseSqlType !== void 0 ? { baseSqlType } : {}
+    sqlCast: options.sqlCast,
+    ...options.baseSqlType !== void 0 ? { baseSqlType: options.baseSqlType } : {}
   });
-  Reflect.defineMetadata(COLUMNS_KEY, columns, constructor);
 }
-function createColumnDecorator(typeCast, serialize, skipAutoInfer = false, sqlCast) {
+function parseColumnOptions(columnNameOrOptions, propKey) {
+  if (typeof columnNameOrOptions === "string") return { columnName: columnNameOrOptions };
+  if (columnNameOrOptions) {
+    return {
+      columnName: columnNameOrOptions.columnName || propKey,
+      primaryKey: columnNameOrOptions.primaryKey,
+      autoIncrement: columnNameOrOptions.autoIncrement
+    };
+  }
+  return { columnName: propKey };
+}
+function rejectNonText(family, val) {
+  if (val === null || val === void 0) return null;
+  if (val instanceof Date) {
+    throw new Error(
+      `litedbmodel: @column.${family}() received a Date. A text column cannot serialize one \u2014 the driver would store an object literal. Use @column.datetime() / @column.date() for a date column, or format the value yourself.`
+    );
+  }
+  if (typeof val === "object") {
+    throw new Error(
+      `litedbmodel: @column.${family}() received an object. Use @column.json<T>() for a JSON column, or @column.custom() with a serializer.`
+    );
+  }
+  return val;
+}
+function materializeString(family, v) {
+  if (v === void 0 || v === null) return v;
+  if (typeof v === "string") return v;
+  if (typeof v === "number" || typeof v === "bigint" || typeof v === "boolean") return String(v);
+  throw new Error(
+    `materialize ${family}: driver returned ${typeof v} for a ${family} column. Use @column.passthrough() for a BYTEA/BLOB column, or @column.json<T>() for JSON.`
+  );
+}
+function createColumnDecorator(typeCast, serialize, sqlCast, baseSqlType) {
   return function(columnNameOrOptions) {
-    return function(target, propertyKey) {
-      const propKey = String(propertyKey);
-      const shouldSkipAutoInfer = skipAutoInfer || typeCast !== void 0;
-      let columnName;
-      let primaryKey;
-      let autoIncrement;
-      if (typeof columnNameOrOptions === "string") {
-        columnName = columnNameOrOptions;
-      } else if (columnNameOrOptions) {
-        columnName = columnNameOrOptions.columnName || propKey;
-        primaryKey = columnNameOrOptions.primaryKey;
-        autoIncrement = columnNameOrOptions.autoIncrement;
-      } else {
-        columnName = propKey;
+    return function(targetOrValue, keyOrContext) {
+      if (isStandardContext(keyOrContext)) {
+        const propKey2 = String(keyOrContext.name);
+        const parsed2 = parseColumnOptions(columnNameOrOptions, propKey2);
+        registerColumn(standardColumnMap(classMetadataBag(keyOrContext, propKey2)), propKey2, {
+          ...parsed2,
+          typeCast,
+          serialize,
+          sqlCast,
+          baseSqlType
+        });
+        return;
       }
-      registerColumn(target, propKey, {
-        columnName,
+      const propKey = String(keyOrContext);
+      const parsed = parseColumnOptions(columnNameOrOptions, propKey);
+      registerColumn(legacyColumnMap(targetOrValue.constructor), propKey, {
+        ...parsed,
         typeCast,
         serialize,
-        skipAutoInfer: shouldSkipAutoInfer,
-        primaryKey,
-        autoIncrement,
-        sqlCast
+        sqlCast,
+        baseSqlType
       });
     };
   };
 }
+function requireColumnFamily() {
+  throw new Error(
+    "litedbmodel: `@column()` no longer declares a column \u2014 a column must state its type with a family: @column.text() / .decimal() / .number() / .boolean() / .bigint() / .datetime() / .date() / .uuid() / .json() / .stringArray() / .intArray() / .numericArray() / .booleanArray() / .datetimeArray() / .passthrough() / .custom(). Every family takes the same argument as `@column()` did (`@column.text('db_name')`, `@column.number({ primaryKey: true })`). The bare form inferred the type from `emitDecoratorMetadata`, which esbuild (tsx/vite/vitest) never emits and standard decorators do not have, so it silently produced untyped reads."
+  );
+}
 function serializeArray(val, typeCast) {
   if (val === null || val === void 0) return null;
   if (!Array.isArray(val)) return val;
@@ -6540,19 +6496,47 @@ function serializeJson(val, typeCast) {
   return JSON.stringify(val);
 }
 var column = Object.assign(
-  // Basic @column() - no type conversion
-  createColumnDecorator(),
+  // The bare `@column()` declared no type — it is rejected, with the migration in the message.
+  (_columnNameOrOptions) => requireColumnFamily(),
   {
     // ============================================
     // Primitive Types
     // ============================================
+    /**
+     * Text type (TEXT / VARCHAR / CHAR / ENUM / citext) — the driver value is already a string, so no
+     * cast is applied. The family still DECLARES the column so the typed read types it as `TEXT`.
+     * @example @column.text() name?: string;
+     * @example @column.text('user_name') name?: string;
+     */
+    text: (columnNameOrOptions) => createColumnDecorator(
+      (v) => materializeString("text", v),
+      // the family DECLARES `string`, so it hands back one
+      (val) => rejectNonText("text", val),
+      // …and it cannot SERIALIZE a Date or an object
+      void 0,
+      // no sqlCast family (a text literal needs no SQL cast)
+      "TEXT"
+      // §4.1 token: types the SCP typed read
+    )(columnNameOrOptions),
+    /**
+     * Exact decimal type (NUMERIC / DECIMAL) — read back as its exact decimal STRING (a JS number
+     * rounds past 2^53). The family states the column is `numeric`, so a write binds the string as a
+     * numeric — a batch write (`createMany` / `updateMany`) included.
+     * @example @column.decimal() price?: string;
+     */
+    decimal: (columnNameOrOptions) => createColumnDecorator(
+      (v) => materializeString("decimal", v),
+      (val) => rejectNonText("decimal", val),
+      "numeric"
+      // sqlCast for WHERE / INSERT / batch-write type casting
+    )(columnNameOrOptions),
     /**
      * Boolean type conversion
      * Converts 't'/'f', 'true'/'false', 1/0 to boolean
      * Preserves null for nullable columns, undefined stays undefined
      * @example @column.boolean() is_active?: boolean;
      */
-    boolean: (columnName) => createColumnDecorator(
+    boolean: (columnNameOrOptions) => createColumnDecorator(
       // v2 read contract: BOOLEAN → boolean, via the shared materializer (issue #9).
       (v) => {
         if (v === void 0) return void 0;
@@ -6560,42 +6544,38 @@ var column = Object.assign(
       },
       void 0,
       // no custom serialize
-      false,
-      // allow auto-inference
       "boolean"
       // sqlCast for updateMany type inference
-    )(columnName),
+    )(columnNameOrOptions),
     /**
      * Number type conversion (from string)
      * Preserves null for nullable columns, undefined stays undefined
      * @example @column.number() amount?: number;
      */
-    number: (columnName) => createColumnDecorator((v) => {
+    number: (columnNameOrOptions) => createColumnDecorator((v) => {
       if (v === void 0) return void 0;
       if (v === null) return null;
       const n = Number(v);
       return isNaN(n) ? null : n;
-    })(columnName),
+    })(columnNameOrOptions),
     /**
      * BigInt type conversion
      * Preserves null for nullable columns, undefined stays undefined
-     * @example @column.bigint() large_id?: bigint;
+     * @example @column.bigint() large_id?: bigint;   // bc `int` — a JS bigint, checked i64
      */
-    bigint: (columnName) => createColumnDecorator(
-      // v2 read contract: BIGINT/INT8 → EXACT decimal STRING (no i64 rounding, JSON-safe), via the
-      // shared materializer (issue #9). The declared TS field type may still be `bigint` in existing
-      // models, but the runtime value is now the exact string — that IS the realignment.
+    bigint: (columnNameOrOptions) => createColumnDecorator(
+      // An integer column reads back as a JS `bigint` — behavior-contracts' `int` value model
+      // (`int` = bigint, checked i64), which is what the drivers already hand over. `JSON.stringify`
+      // does not serialize a bigint: give the field a `toJSON`, or convert at the boundary.
       (v) => {
         if (v === void 0) return void 0;
-        return materializeCell(v, "int64");
+        return materializeCell(v, "int");
       },
       void 0,
       // no custom serialize
-      false,
-      // allow auto-inference
       "bigint"
       // sqlCast for WHERE/INSERT type casting
-    )(columnName),
+    )(columnNameOrOptions),
     // ============================================
     // Date/Time Types
     // ============================================
@@ -6607,9 +6587,9 @@ var column = Object.assign(
      * - PostgreSQL: Serializes to ISO 8601 UTC string with 'Z' suffix for explicit timezone
      * - MySQL/SQLite: Passes Date object to driver (driver-dependent timezone handling)
      * 
-     * @example @column.datetime() created_at?: Date;
+     * @example @column.datetime() created_at?: string;  // TZ-attached string, NOT a JS Date
      */
-    datetime: (columnName) => createColumnDecorator(
+    datetime: (columnNameOrOptions) => createColumnDecorator(
       // v2 read contract: DATE/TIMESTAMP/TIMESTAMPTZ/DATETIME/TIME → TZ-attached STRING (NOT a
       // TZ-shifted JS Date), via the shared materializer (issue #9). A driver already returning the
       // native textual form passes through; a JS Date is rendered to its lossless ISO instant.
@@ -6625,11 +6605,9 @@ var column = Object.assign(
         }
         return val;
       },
-      false,
-      // allow auto-inference
       "timestamp"
       // sqlCast for updateMany type inference
-    )(columnName),
+    )(columnNameOrOptions),
     /**
      * Date type conversion — returns YYYY-MM-DD string.
      * Preserves null for nullable columns, undefined stays undefined.
@@ -6637,9 +6615,9 @@ var column = Object.assign(
      * DB values (Date object or string) are normalized to 'YYYY-MM-DD' string.
      * On write, string values are passed through; Date objects are formatted as 'YYYY-MM-DD'.
      * 
-     * @example @column.date() birth_date?: string;
+     * @example @column.date() birth_date?: string;      // 'YYYY-MM-DD'
      */
-    date: (columnName) => createColumnDecorator(
+    date: (columnNameOrOptions) => createColumnDecorator(
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
@@ -6664,11 +6642,9 @@ var column = Object.assign(
         }
         return val;
       },
-      false,
-      // allow auto-inference
       "date"
       // sqlCast for updateMany type inference
-    )(columnName),
+    )(columnNameOrOptions),
     // ============================================
     // Array Types
     // ============================================
@@ -6677,71 +6653,71 @@ var column = Object.assign(
      * Preserves null for nullable columns, undefined stays undefined
      * @example @column.stringArray() tags?: string[];
      */
-    stringArray: (columnName) => createColumnDecorator(
+    stringArray: (columnNameOrOptions) => createColumnDecorator(
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
-        return castToStringArray(v);
+        return castToStringArray2(v);
       },
       serializeArray,
-      false,
       "text[]"
-    )(columnName),
+    )(columnNameOrOptions),
     /**
      * Integer array type conversion (integer[])
      * Preserves null for nullable columns, undefined stays undefined
      * @example @column.intArray() scores?: number[];
      */
-    intArray: (columnName) => createColumnDecorator(
+    intArray: (columnNameOrOptions) => createColumnDecorator(
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
-        return castToIntegerArray(v);
+        return castToIntegerArray2(v);
       },
       serializeArray,
-      false,
       "int[]"
-    )(columnName),
+    )(columnNameOrOptions),
     /**
      * Numeric array type conversion (numeric[], allows null elements)
      * Preserves null for nullable columns, undefined stays undefined
      * @example @column.numericArray() values?: (number | null)[];
      */
-    numericArray: (columnName) => createColumnDecorator(
+    numericArray: (columnNameOrOptions) => createColumnDecorator(
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
-        return castToNumericArray(v);
+        return castToNumericArray2(v);
       },
       serializeArray,
-      false,
       "numeric[]"
-    )(columnName),
+    )(columnNameOrOptions),
     /**
      * Boolean array type conversion (boolean[])
      * Preserves null for nullable columns, undefined stays undefined
      * @example @column.booleanArray() flags?: (boolean | null)[];
      */
-    booleanArray: (columnName) => createColumnDecorator(
+    booleanArray: (columnNameOrOptions) => createColumnDecorator(
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
-        return castToBooleanArray(v);
+        return castToBooleanArray2(v);
       },
       serializeBooleanArray,
-      false,
       "boolean[]"
-    )(columnName),
+    )(columnNameOrOptions),
     /**
      * DateTime array type conversion (timestamp[])
      * Preserves null for nullable columns, undefined stays undefined
-     * @example @column.datetimeArray() event_dates?: (Date | null)[];
+     * @example @column.datetimeArray() event_dates?: (string | null)[];
      */
-    datetimeArray: (columnName) => createColumnDecorator(
+    datetimeArray: (columnNameOrOptions) => createColumnDecorator(
+      // Element-wise the SAME contract as `@column.datetime()`: a TZ-attached STRING, never a
+      // TZ-shifted JS Date. The array family used to be the one place a `Date` still came back, so
+      // `JSON.stringify` of a row silently re-rendered those elements in UTC — the exact hazard #9
+      // closed for the scalar.
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
-        return castToDatetimeArray(v);
+        return castToDatetimeArray2(v).map((d) => d === null ? null : materializeCell(d, "date"));
       },
       // DateTime arrays serialize each Date to ISO string
       (val) => {
@@ -6750,7 +6726,7 @@ var column = Object.assign(
         const mapped = val.map((v) => v === null ? "NULL" : v instanceof Date ? v.toISOString() : String(v));
         return `{${mapped.join(",")}}`;
       }
-    )(columnName),
+    )(columnNameOrOptions),
     // ============================================
     // JSON Types
     // ============================================
@@ -6760,16 +6736,15 @@ var column = Object.assign(
      * @example @column.json() metadata?: Record<string, unknown>;
      * @example @column.json<UserSettings>() settings?: UserSettings;
      */
-    json: (columnName) => createColumnDecorator(
+    json: (columnNameOrOptions) => createColumnDecorator(
       (v) => {
         if (v === void 0) return void 0;
         if (v === null) return null;
-        return castToJson(v);
+        return castToJson2(v);
       },
       serializeJson,
-      false,
       "jsonb"
-    )(columnName),
+    )(columnNameOrOptions),
     // ============================================
     // UUID Type (PostgreSQL)
     // ============================================
@@ -6798,61 +6773,101 @@ var column = Object.assign(
         if (v === null) return null;
         return String(v);
       },
-      void 0,
-      // No serialization needed - handled by sqlCast
-      true,
-      // Skip auto-inference
+      (val) => rejectNonText("uuid", val),
+      // the ::uuid cast handles the rest
       "uuid"
       // SQL type for casting
     )(columnNameOrOptions),
     // ============================================
     // Custom Type Conversion
     // ============================================
+    /**
+     * The driver's value, UNCAST — for a column whose type the library has no cast for (`BYTEA` /
+     * `BLOB` arrives as a driver Buffer, a vendor type as whatever the driver decodes). It states
+     * "this column is passed through", which is a DECLARATION; the removed bare `@column()` was the
+     * absence of one, and produced this same passthrough by accident for every unresolvable type.
+     * @example @column.passthrough() payload?: unknown;
+     */
+    passthrough: (columnNameOrOptions) => createColumnDecorator()(columnNameOrOptions),
     /**
      * Custom type conversion with user-provided function
      * @example @column.custom((v) => String(v).toUpperCase()) status?: string;
      * @example @column.custom((v) => v, (v) => JSON.stringify(v)) data?: MyType; // with serializer
      */
-    custom: (castFn, serializeFn, columnName) => createColumnDecorator(castFn, serializeFn)(columnName)
+    custom: (castFn, serializeFn, columnNameOrOptions) => createColumnDecorator(castFn, serializeFn)(columnNameOrOptions)
   }
 );
-function registerRelation(target, propertyKey, type, keysFactory, options) {
-  const constructor = target.constructor;
-  const relations = Reflect.getMetadata(RELATIONS_KEY, constructor) || [];
-  relations.push({
-    propertyKey,
-    type,
-    keysFactory,
-    options
-  });
-  Reflect.defineMetadata(RELATIONS_KEY, relations, constructor);
+function registerRelation(relations, propertyKey, type, keysFactory, options) {
+  relations.push({ propertyKey, type, keysFactory, options });
+}
+function createRelationDecorator(type, keys, options) {
+  return function(targetOrValue, keyOrContext) {
+    if (isStandardContext(keyOrContext)) {
+      const propKey2 = String(keyOrContext.name);
+      registerRelation(standardRelationList(classMetadataBag(keyOrContext, propKey2)), propKey2, type, keys, options);
+      if (typeof keyOrContext.addInitializer !== "function") {
+        throw new Error(
+          `litedbmodel: the standard-decorator context for relation '${propKey2}' has no \`addInitializer\`, so the class field cannot be removed and would shadow the relation getter.`
+        );
+      }
+      keyOrContext.addInitializer(function() {
+        if (Object.prototype.hasOwnProperty.call(this, propKey2)) {
+          delete this[propKey2];
+        }
+      });
+      return;
+    }
+    const propKey = String(keyOrContext);
+    registerRelation(legacyRelationList(targetOrValue.constructor), propKey, type, keys, options);
+  };
 }
 function hasMany(keys, options) {
-  return function(target, propertyKey) {
-    registerRelation(target, String(propertyKey), "hasMany", keys, options);
-  };
+  return createRelationDecorator("hasMany", keys, options);
 }
 function belongsTo(keys, options) {
-  return function(target, propertyKey) {
-    registerRelation(target, String(propertyKey), "belongsTo", keys, options);
-  };
+  return createRelationDecorator("belongsTo", keys, options);
 }
 function hasOne(keys, options) {
-  return function(target, propertyKey) {
-    registerRelation(target, String(propertyKey), "hasOne", keys, options);
-  };
+  return createRelationDecorator("hasOne", keys, options);
 }
 function getRelationMeta(modelClass) {
   return modelClass._relationMeta || Reflect.getMetadata(RELATIONS_KEY, modelClass) || [];
 }
-function model(tableNameOrConstructor, options) {
+function model(tableNameOrConstructor, optionsOrContext) {
   if (typeof tableNameOrConstructor === "string") {
     const tableName = tableNameOrConstructor;
-    return function(constructor) {
-      return applyModelDecorator(constructor, tableName, options);
+    const options = optionsOrContext;
+    return function(constructor, context) {
+      return applyToClass(constructor, context, tableName, options);
+    };
+  }
+  return applyToClass(tableNameOrConstructor, optionsOrContext);
+}
+function applyToClass(constructor, context, tableName, options) {
+  const members = modelMembers(constructor, context);
+  if (!isStandardContext(context)) return applyModelDecorator(constructor, members, tableName, options);
+  if (typeof context.addInitializer !== "function") {
+    throw new Error(
+      `litedbmodel: the standard-decorator context for '${constructor.name}' has no \`addInitializer\`, so \`@model\` cannot assemble the model after the class is defined.`
+    );
+  }
+  context.addInitializer(function() {
+    applyModelDecorator(this, members, tableName, options);
+  });
+  return constructor;
+}
+function modelMembers(constructor, context) {
+  if (isStandardContext(context)) {
+    const bag = classMetadataBag(context, String(constructor.name ?? "model"));
+    return {
+      columns: bag[COLUMNS_KEY] ?? /* @__PURE__ */ new Map(),
+      relations: bag[RELATIONS_KEY] ?? []
     };
   }
-  return applyModelDecorator(tableNameOrConstructor);
+  return {
+    columns: Reflect.getMetadata(COLUMNS_KEY, constructor) ?? /* @__PURE__ */ new Map(),
+    relations: Reflect.getMetadata(RELATIONS_KEY, constructor) ?? []
+  };
 }
 function isCompositeKeys(keys) {
   return Array.isArray(keys[0]);
@@ -6872,9 +6887,8 @@ function parseKeys(keys) {
     };
   }
 }
-function applyModelDecorator(constructor, tableName, options) {
-  const columns = Reflect.getMetadata(COLUMNS_KEY, constructor) || /* @__PURE__ */ new Map();
-  const relations = Reflect.getMetadata(RELATIONS_KEY, constructor) || [];
+function applyModelDecorator(constructor, members, tableName, options) {
+  const { columns, relations } = members;
   const modelName = constructor.name;
   if (tableName) {
     Object.defineProperty(constructor, "TABLE_NAME", {
@@ -6937,7 +6951,7 @@ function applyModelDecorator(constructor, tableName, options) {
   const effectiveTableName = tableName ?? modelName.toLowerCase();
   for (const [propKey, meta] of columns) {
     Object.defineProperty(constructor, propKey, {
-      value: createColumn(meta.columnName, effectiveTableName, modelName, propKey, meta.sqlCast),
+      value: createColumn(meta.columnName, effectiveTableName, modelName, propKey, meta.sqlCast, meta.serialize),
       writable: false,
       enumerable: true,
       configurable: false
@@ -6981,17 +6995,36 @@ function applyModelDecorator(constructor, tableName, options) {
         const keys = keysFactory();
         const { sourceKeys, targetKeys, targetModelName } = parseKeys(keys);
         const order = options2?.order ? orderToString(options2.order()) : null;
-        const conditions = options2?.where ? condsToRecord(options2.where()) : void 0;
         return this._loadRelation(type, targetModelName, {
           sourceKeys,
           targetKeys,
           order,
-          conditions,
+          where: options2?.where?.(),
           limit: options2?.limit,
           hardLimit: options2?.hardLimit,
           relationName: propertyKey
         });
       },
+      /**
+       * A relation is a getter, but a class FIELD declaring it still writes to the property. Which
+       * write it is depends on `useDefineForClassFields`: with define semantics (the default from
+       * target ES2022) the field is `defineProperty`-d onto the instance, bypassing this setter — the
+       * standard protocol's initializer removes that shadowing property. With SET semantics (the
+       * default below ES2022) the field ASSIGNS, and an accessor with no setter throws
+       * `Cannot set property … which has only a getter` on EVERY instantiation.
+       *
+       * So: the field's own `undefined` is ignored, and any other value is honoured as an own
+       * property — priming a relation (a loaded graph, a test double) reads back what was set.
+       */
+      set: function(value) {
+        if (value === void 0) return;
+        Object.defineProperty(this, propertyKey, {
+          value,
+          writable: true,
+          enumerable: true,
+          configurable: true
+        });
+      },
       enumerable: true,
       configurable: false
     });
@@ -7109,6 +7142,7 @@ function serializeRecord(modelClass, record, typeCast) {
 // src/scp/decorator-adapter.ts
 var COLUMN_FAMILY_SQL_TYPE = {
   boolean: "BOOLEAN",
+  numeric: "NUMERIC",
   bigint: "BIGINT",
   timestamp: "TIMESTAMP",
   date: "DATE",
@@ -7261,23 +7295,6 @@ function createDriver(config, options) {
 }
 function getTypeCastForDriver(driverType) {
   if (driverType === "sqlite") {
-    return {
-      castToDatetime: castToDatetime3,
-      castToBoolean: castToBoolean3,
-      castToIntegerArray: castToIntegerArray3,
-      castToNumericArray: (val) => castToIntegerArray3(val).map((v) => v),
-      castToStringArray: castToStringArray3,
-      castToBooleanArray: (val) => {
-        const arr = castToStringArray3(val);
-        return arr.map((v) => castToBoolean3(v));
-      },
-      castToDatetimeArray: (val) => {
-        const arr = castToStringArray3(val);
-        return arr.map((v) => castToDatetime3(v));
-      },
-      castToJson: castToJson3
-    };
-  } else if (driverType === "mysql") {
     return {
       castToDatetime: castToDatetime4,
       castToBoolean: castToBoolean4,
@@ -7294,16 +7311,33 @@ function getTypeCastForDriver(driverType) {
       },
       castToJson: castToJson4
     };
+  } else if (driverType === "mysql") {
+    return {
+      castToDatetime: castToDatetime3,
+      castToBoolean: castToBoolean3,
+      castToIntegerArray: castToIntegerArray3,
+      castToNumericArray: (val) => castToIntegerArray3(val).map((v) => v),
+      castToStringArray: castToStringArray3,
+      castToBooleanArray: (val) => {
+        const arr = castToStringArray3(val);
+        return arr.map((v) => castToBoolean3(v));
+      },
+      castToDatetimeArray: (val) => {
+        const arr = castToStringArray3(val);
+        return arr.map((v) => castToDatetime3(v));
+      },
+      castToJson: castToJson3
+    };
   } else {
     return {
-      castToDatetime: castToDatetime2,
-      castToBoolean: castToBoolean2,
-      castToIntegerArray: castToIntegerArray2,
-      castToNumericArray: castToNumericArray2,
-      castToStringArray: castToStringArray2,
-      castToBooleanArray: castToBooleanArray2,
-      castToDatetimeArray: castToDatetimeArray2,
-      castToJson: castToJson2
+      castToDatetime,
+      castToBoolean,
+      castToIntegerArray,
+      castToNumericArray,
+      castToStringArray,
+      castToBooleanArray,
+      castToDatetimeArray,
+      castToJson
     };
   }
 }
@@ -8054,8 +8088,8 @@ var DBModel = class _DBModel {
    * ```typescript
    * @model('users')
    * class UserModel extends DBModel {
-   *   @column() id?: number;
-   *   @column() name?: string;
+   *   @column.number() id?: number;
+   *   @column.text() name?: string;
    * }
    * export const User = UserModel.asModel();
    * export type User = UserModel;
@@ -8187,15 +8221,14 @@ var DBModel = class _DBModel {
   static _scpColumnTypesCache = /* @__PURE__ */ new WeakMap();
   /**
    * The §4.1 column-type OVERRIDES for the SCP read/write bundle (the F1 `columnTypes` escape hatch).
-   * Phase F-2 (#105): a column whose SQL type cannot be derived from the decorator — no explicit
-   * `sqlCast` family AND no `baseSqlType` (its TS `design:type` is `Object`, e.g. a NULLABLE
-   * `string | null` / `number | null` field: TS emits `design:type = Object` for a union) — would
-   * otherwise take the blanket-INTEGER default and THROW `materialize int32` on a live string. Because
+   * A column whose SQL type cannot be derived from its family — `@column.number()`, whose JS `number`
+   * backs an INTEGER just as well as a REAL/DECIMAL (pg returns DECIMAL as a string that an `int32`
+   * materialize REJECTS) — would otherwise take the blanket-INTEGER default and THROW. Because
    * the DBModel read path does its OWN v1 de-box (`_createInstance` → `typeCastFromDB`), the SCP typed
    * read only needs a NON-THROWING, passthrough-safe SQL type for such columns: we pin them to `TEXT`
    * (passthrough — the driver value flows through unchanged, then v1 casts it). Columns WITH a derivable
-   * type (explicit family / a non-union `design:type`) keep it. This preserves the v1 read contract
-   * exactly (int→number, string→string) while never throwing on an undeterminable nullable column.
+   * type (every family but `@column.number()`) keep it. This preserves the v1 read contract exactly
+   * (int→number, string→string) while never throwing on a column whose width the model did not state.
    * @internal
    */
   static _scpColumnTypes() {
@@ -8207,7 +8240,7 @@ var DBModel = class _DBModel {
       for (const [propKey, m] of meta) {
         const baseSqlType = m.baseSqlType;
         if (m.sqlCast !== void 0) continue;
-        if (baseSqlType !== void 0 && baseSqlType !== "INTEGER") continue;
+        if (baseSqlType !== void 0) continue;
         columnTypes[propKey] = "TEXT";
       }
     }
@@ -8316,6 +8349,30 @@ var DBModel = class _DBModel {
       return void 0;
     }
   }
+  /**
+   * A subquery's `[column, value]` conditions, each literal value bound the way the column's family
+   * writes it (see {@link _getConditionTypeCast}); a correlation reference passes through.
+   * @internal
+   */
+  static _subqueryConditions(conditions) {
+    const typeCast = this._getConditionTypeCast();
+    return conditions.map(([col, value]) => ({
+      column: col,
+      value: value instanceof DBToken ? value : serializeCondValue(col, value, typeCast)
+    }));
+  }
+  /**
+   * The driver's type cast a condition value binds with — the one a create / update serializes with.
+   * Returns undefined if DBHandler is not initialized, like {@link _getSqlCastFormatter}.
+   * @internal
+   */
+  static _getConditionTypeCast() {
+    try {
+      return getTypeCast2(this.getDriverType());
+    } catch {
+      return void 0;
+    }
+  }
   /**
    * Get a DBHandler instance for this model.
    * Connection priority:
@@ -8550,7 +8607,7 @@ var DBModel = class _DBModel {
     }
     const normalizedCond = normalizeConditions(conditions);
     if (this.FIND_FILTER) {
-      const filterCondition = condsToRecord(this.FIND_FILTER);
+      const filterCondition = condsToRecord(this.FIND_FILTER, this._getConditionTypeCast());
       normalizedCond.add(filterCondition);
     }
     const formatter = this._getSqlCastFormatter();
@@ -8669,7 +8726,7 @@ var DBModel = class _DBModel {
   /** Merge FIND_FILTER (the model's default filter) into a condition object (v1 `_buildSelectSQL` parity). */
   static _mergeFindFilter(conditions) {
     if (!this.FIND_FILTER) return conditions;
-    const filter = condsToRecord(this.FIND_FILTER);
+    const filter = condsToRecord(this.FIND_FILTER, this._getConditionTypeCast());
     return { ...conditions, ...filter };
   }
   /** Build model instances from raw rows, wiring the deferred relation context (v1 `query` parity). @internal */
@@ -8738,7 +8795,7 @@ var DBModel = class _DBModel {
     }
     const normalizedCond = normalizeConditions(conditions);
     if (this.FIND_FILTER) {
-      const filterCondition = condsToRecord(this.FIND_FILTER);
+      const filterCondition = condsToRecord(this.FIND_FILTER, this._getConditionTypeCast());
       normalizedCond.add(filterCondition);
     }
     const formatter = this._getSqlCastFormatter();
@@ -9071,10 +9128,7 @@ var DBModel = class _DBModel {
     const parentColumns = pairs.map((pair) => pair[0]);
     const selectColumns = pairs.map((pair) => pair[1]);
     const targetTableName = selectColumns[0]?.tableName ?? "";
-    const subqueryConditions = conditions.map(([col, value]) => ({
-      column: col,
-      value
-    }));
+    const subqueryConditions = this._subqueryConditions(conditions);
     return ["__subquery__", new DBSubquery(parentColumns, targetTableName, selectColumns, subqueryConditions, "IN")];
   }
   /**
@@ -9110,10 +9164,7 @@ var DBModel = class _DBModel {
     const parentColumns = pairs.map((pair) => pair[0]);
     const selectColumns = pairs.map((pair) => pair[1]);
     const targetTableName = selectColumns[0]?.tableName ?? "";
-    const subqueryConditions = conditions.map(([col, value]) => ({
-      column: col,
-      value
-    }));
+    const subqueryConditions = this._subqueryConditions(conditions);
     return ["__subquery__", new DBSubquery(parentColumns, targetTableName, selectColumns, subqueryConditions, "NOT IN")];
   }
   /**
@@ -9141,10 +9192,7 @@ var DBModel = class _DBModel {
    */
   static exists(conditions) {
     const targetTableName = conditions[0]?.[0]?.tableName ?? "";
-    const subqueryConditions = conditions.map(([col, value]) => ({
-      column: col,
-      value
-    }));
+    const subqueryConditions = this._subqueryConditions(conditions);
     return ["__exists__", new DBExists(targetTableName, subqueryConditions, false)];
   }
   /**
@@ -9171,10 +9219,7 @@ var DBModel = class _DBModel {
    */
   static notExists(conditions) {
     const targetTableName = conditions[0]?.[0]?.tableName ?? "";
-    const subqueryConditions = conditions.map(([col, value]) => ({
-      column: col,
-      value
-    }));
+    const subqueryConditions = this._subqueryConditions(conditions);
     return ["__exists__", new DBExists(targetTableName, subqueryConditions, true)];
   }
   // ============================================
@@ -9425,7 +9470,7 @@ var DBModel = class _DBModel {
     }
     const relationConfig = {
       targetClass: TargetClass,
-      conditions: config.conditions,
+      conditions: config.where ? condsToRecord(config.where, TargetClass._getConditionTypeCast()) : void 0,
       order: config.order,
       limit: config.limit,
       hardLimit: config.hardLimit,
@@ -9722,7 +9767,7 @@ var DBModel = class _DBModel {
    */
   static find(conditions, options) {
     const core = async (conds, opts) => {
-      const conditionRecord = condsToRecord(conds);
+      const conditionRecord = condsToRecord(conds, this._getConditionTypeCast());
       const hardLimit = _DBModel._limitConfig.findHardLimit;
       const shouldCheckLimit = hardLimit != null && !opts?.limit;
       const effectiveOpts = shouldCheckLimit ? { ...opts, limit: hardLimit + 1 } : opts;
@@ -9756,7 +9801,7 @@ var DBModel = class _DBModel {
    */
   static findOne(conditions, options) {
     const core = async (conds, opts) => {
-      const conditionRecord = condsToRecord(conds);
+      const conditionRecord = condsToRecord(conds, this._getConditionTypeCast());
       const results = await this._select(conditionRecord, { ...opts, limit: 1 });
       return results.length > 0 ? results[0] : null;
     };
@@ -9834,7 +9879,7 @@ var DBModel = class _DBModel {
    */
   static count(conditions) {
     const core = async (conds) => {
-      const conditionRecord = condsToRecord(conds);
+      const conditionRecord = condsToRecord(conds, this._getConditionTypeCast());
       return this._count(conditionRecord);
     };
     return this._applyMiddleware("count", core, [conditions]);
@@ -9968,7 +10013,7 @@ var DBModel = class _DBModel {
    */
   static update(conditions, values, options) {
     const core = async (conds, vals, opts) => {
-      const conditionRecord = condsToRecord(conds);
+      const conditionRecord = condsToRecord(conds, this._getConditionTypeCast());
       const valueRecord = pairsToRecord(vals);
       if (!opts?.returning) {
         await this._update(conditionRecord, valueRecord, {});
@@ -10020,7 +10065,7 @@ var DBModel = class _DBModel {
    */
   static delete(conditions, options) {
     const core = async (conds, opts) => {
-      const conditionRecord = condsToRecord(conds);
+      const conditionRecord = condsToRecord(conds, this._getConditionTypeCast());
       if (!opts?.returning) {
         await this._delete(conditionRecord, {});
         return null;
@@ -10426,12 +10471,12 @@ var DBModel = class _DBModel {
    * // Define models using appropriate base class
    * @model('users')
    * class UserModel extends BaseDB {
-   *   @column() id?: number;
+   *   @column.number() id?: number;
    * }
    *
    * @model('articles')
    * class ArticleModel extends CmsDB {
-   *   @column() id?: number;
+   *   @column.number() id?: number;
    * }
    *
    * // Each base class has independent transactions