@drzl/analyzer 1.15.0 → 1.17.0

package/dist/index.cjs

@@ -33,6 +33,7 @@ __export(index_exports, {
   SchemaAnalyzer: () => SchemaAnalyzer,
   default: () => index_default,
   describeV1Column: () => describeV1Column,
+  isDrizzleView: () => isDrizzleView,
   isReadOnlyRelation: () => isReadOnlyRelation,
   isRelationsV2: () => isRelationsV2,
   readRelationsV2: () => readRelationsV2
@@ -68,6 +69,13 @@ var TUPLE_CLASS_SHAPES = {
   PgPointTuple: { kind: "tuple", length: 2 },
   PgLineTuple: { kind: "tuple", length: 3 }
 };
+var V1_ONLY_ENTITY_KINDS = /^(?:MsSql|Cockroach)/;
+var BYTE_STRING_CLASSES = /* @__PURE__ */ new Set([
+  "MySqlBinary",
+  "MySqlVarBinary",
+  "SingleStoreBinary",
+  "SingleStoreVarBinary"
+]);
 function describeV1Column(column) {
   const codec = column?.codec;
   const dataType = column?.dataType;
@@ -80,8 +88,9 @@ function describeV1Column(column) {
       shape: { kind: "custom", sqlType: typeof sqlType === "string" ? sqlType : void 0 }
     };
   }
+  const entityKind = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
   const [js, semantic = ""] = dataType.split(" ");
-  if (typeof codec !== "string" && !semantic) return null;
+  if (typeof codec !== "string" && !semantic && !V1_ONLY_ENTITY_KINDS.test(entityKind)) return null;
   const out = {};
   switch (semantic) {
     case "int8":
@@ -117,7 +126,7 @@ function describeV1Column(column) {
     case "float":
     case "double": {
       if (semantic === "float")
-        [out.min, out.max] = codec === "float4" ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
+        [out.min, out.max] = codec === "float4" || entityKind.startsWith("Cockroach") ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
       out.integer = false;
       out.tsType = "number";
       out.dbType = semantic === "float" ? "REAL" : "DOUBLE";
@@ -167,17 +176,20 @@ function describeV1Column(column) {
       out.tsType = "string";
       out.dbType = semantic.toUpperCase();
       break;
-    case "binary":
+    case "binary": {
+      const entity = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
+      const bytes = entity.startsWith("MySql") || entity.startsWith("SingleStore");
       out.tsType = "string";
       out.dbType = codec === "bit" ? "BIT" : "BINARY";
-      out.shape = {
+      out.shape = bytes ? { kind: "byteString", length: declaredLength(column) } : {
         kind: "bitstring",
         length: declaredLength(column),
-        // A Postgres `bit(3)` holds exactly three digits; a MySQL `binary(4)`/`varbinary(16)`
-        // holds at most that many, which is why `''` is valid there and not here.
+        // A Postgres `bit(3)` holds exactly three digits; a Cockroach `varbit(16)` holds at
+        // most that many, which is why `''` is valid there and not here.
         exact: codec === "bit"
       };
       break;
+    }
     case "point":
     case "geometry":
       out.tsType = "[number, number]";
@@ -234,15 +246,33 @@ function declaredLength(column) {
   const n = column?.length ?? column?.config?.length ?? column?.config?.dimensions;
   return typeof n === "number" && Number.isFinite(n) && n > 0 ? n : void 0;
 }
-function getSymbolOf(target, key) {
-  if (!target) return void 0;
+var VIEW_CONFIG_FIELDS = {
+  "drizzle:Columns": "selectedFields",
+  "drizzle:Name": "name",
+  "drizzle:Schema": "schema"
+};
+function ownSymbolOf(target, key) {
   try {
     for (const sym of Object.getOwnPropertySymbols(target)) {
       if (sym.description === key) return target[sym];
     }
   } catch {
   }
-  return target[Symbol.for(key)];
+  return void 0;
+}
+function getSymbolOf(target, key) {
+  if (!target) return void 0;
+  const own = ownSymbolOf(target, key);
+  if (own !== void 0) return own;
+  const direct = target[Symbol.for(key)];
+  if (direct !== void 0) return direct;
+  const field = VIEW_CONFIG_FIELDS[key];
+  if (!field) return void 0;
+  const cfg = ownSymbolOf(target, "drizzle:ViewBaseConfig");
+  return cfg ? cfg[field] : void 0;
+}
+function isDrizzleView(val) {
+  return !!val && typeof val === "object" && !!getSymbolOf(val, "drizzle:ViewBaseConfig");
 }
 function isReadOnlyRelation(val) {
   if (!val || typeof val !== "object") return false;
@@ -286,17 +316,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     this.schemaPath = schemaPath;
   }
   getSymbol(table, key) {
-    if (!table) return void 0;
-    try {
-      const syms = Object.getOwnPropertySymbols(table);
-      for (const s of syms) {
-        if (s.description === key) {
-          return table[s];
-        }
-      }
-    } catch {
-    }
-    return table[Symbol.for(key)];
+    return getSymbolOf(table, key);
   }
   /**
    * Drizzle keys the Columns object by TypeScript property name, but every other piece of
@@ -545,6 +565,14 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         return { tsType: "bigint", dbType: "BIGINT" };
       case "SQLiteNumeric":
         return { tsType: "string", dbType: "NUMERIC" };
+      // The other two modes of the same column, which matched no arm here and no dialect regex
+      // below either, so both came back UNKNOWN and every generator emitted a schema that
+      // accepted anything at all. Read back through better-sqlite3 3.53.4 on a `numeric` column,
+      // `db.select()` hands back a number in number mode and a bigint in bigint mode.
+      case "SQLiteNumericNumber":
+        return { tsType: "number", dbType: "NUMERIC" };
+      case "SQLiteNumericBigInt":
+        return { tsType: "bigint", dbType: "NUMERIC" };
       case "SQLiteBoolean":
         return { tsType: "boolean", dbType: "INTEGER" };
       // 0.4x gives an enum its own class, which had no arm here at all, so an enum column came
@@ -589,6 +617,15 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         return { tsType: "Date", dbType: "TIMESTAMP" };
       case "PgNumeric":
         return { tsType: "string", dbType: "NUMERIC" };
+      // The other two modes, each its own class. `PgNumericNumber` reached the coarse
+      // `/Numeric|Float|Double|Real/i` arm and got the right answer there; `PgNumericBigInt` got
+      // its `bigint` from the `/BigInt/i` arm meant for `bigint` columns, and the SQL label that
+      // comes with it, so a `numeric(20,0)` was reported as a BIGINT column. Read back through
+      // PGlite, `db.select()` hands back a number in number mode and a bigint in bigint mode.
+      case "PgNumericNumber":
+        return { tsType: "number", dbType: "NUMERIC" };
+      case "PgNumericBigInt":
+        return { tsType: "bigint", dbType: "NUMERIC" };
       case "PgDoublePrecision":
         return { tsType: "number", dbType: "DOUBLE" };
       // `real()` builds a `PgReal`, which matched no arm and fell through to the coarse
@@ -611,6 +648,16 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       case "PgJson":
       case "PgJsonb":
         return { tsType: "any", dbType: ctor === "PgJsonb" ? "JSONB" : "JSON" };
+      // The four builders in `BYTE_STRING_CLASSES`, which the coarse `/Blob|Binary|VarBinary/i`
+      // arms below would otherwise call a `Uint8Array` on the strength of the word "Binary" in
+      // the class name. Asked of MySQL 8.4 through drizzle 0.45.2 instead: the driver hands up a
+      // Buffer, `mapFromDriverValue` decodes it, and the caller receives a string. Every one of
+      // the four declares `dataType: 'string'` and every one of the four defines that method.
+      case "MySqlBinary":
+      case "MySqlVarBinary":
+      case "SingleStoreBinary":
+      case "SingleStoreVarBinary":
+        return { tsType: "string", dbType: "BINARY" };
       default:
         if (column?.config?.mode === "timestamp" || column?.mode === "timestamp") {
           return { tsType: "Date", dbType: "INTEGER" };
@@ -638,7 +685,12 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/BigInt64/i.test(ctor)) return { tsType: "bigint", dbType: "BIGINT" };
           if (/BigInt53/i.test(ctor)) return { tsType: "number", dbType: "BIGINT" };
           if (/\bBigInt\b/i.test(ctor)) return { tsType: "bigint", dbType: "BIGINT" };
-          if (/Decimal|Numeric|Float|Double|Real/i.test(ctor))
+          if (/Decimal/i.test(ctor)) {
+            if (/DecimalNumber$/.test(ctor)) return { tsType: "number", dbType: "NUMERIC" };
+            if (/DecimalBigInt$/.test(ctor)) return { tsType: "bigint", dbType: "NUMERIC" };
+            return { tsType: "string", dbType: "NUMERIC" };
+          }
+          if (/Numeric|Float|Double|Real/i.test(ctor))
             return { tsType: "number", dbType: "NUMERIC" };
           if (/Int|Serial|TinyInt|SmallInt|MediumInt/i.test(ctor))
             return { tsType: "number", dbType: "INTEGER" };
@@ -657,7 +709,12 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/Vector/i.test(ctor)) return { tsType: "any", dbType: "VECTOR" };
           if (/BigInt64/i.test(ctor)) return { tsType: "bigint", dbType: "BIGINT" };
           if (/BigInt53/i.test(ctor)) return { tsType: "number", dbType: "BIGINT" };
-          if (/Decimal|Numeric|Float|Double|Real/i.test(ctor))
+          if (/Decimal/i.test(ctor)) {
+            if (/DecimalNumber$/.test(ctor)) return { tsType: "number", dbType: "NUMERIC" };
+            if (/DecimalBigInt$/.test(ctor)) return { tsType: "bigint", dbType: "NUMERIC" };
+            return { tsType: "string", dbType: "NUMERIC" };
+          }
+          if (/Numeric|Float|Double|Real/i.test(ctor))
             return { tsType: "number", dbType: "NUMERIC" };
           if (/Int|Serial|TinyInt|SmallInt|MediumInt/i.test(ctor))
             return { tsType: "number", dbType: "INTEGER" };
@@ -681,11 +738,10 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/Json/i.test(ctor)) return { tsType: "any", dbType: "JSON" };
           if (/Text/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
           if (/Bytes/i.test(ctor)) return { tsType: "Uint8Array", dbType: "BLOB" };
+          if (/Bool/i.test(ctor)) return { tsType: "boolean", dbType: "BOOLEAN" };
           if (/TimestampTz/i.test(ctor)) return { tsType: "Date", dbType: "TIMESTAMPTZ" };
-          if (/Timestamp/i.test(ctor)) return { tsType: "string", dbType: "TIMESTAMP" };
-          if (/LocalDateString|LocalTime/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
-          if (/DateDuration|RelDuration|Duration/i.test(ctor))
-            return { tsType: "string", dbType: "TEXT" };
+          if (/Timestamp|LocalDateString|LocalTime|DateDuration|RelDuration|Duration/i.test(ctor))
+            return { tsType: "unknown", dbType: "UNKNOWN" };
         }
         return { tsType: "unknown", dbType: "UNKNOWN" };
     }
@@ -730,7 +786,9 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       const sqlKind = String(outerCol?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
       const sqlType = sqlKind.startsWith("MySql") && typeof col?.getSQLType === "function" ? String(col.getSQLType()).toLowerCase() : void 0;
       const byteCap = sqlType ? MYSQL_TEXT_CAPS[sqlType] : void 0;
-      const fallbackShape = dbType === "JSON" || dbType === "JSONB" || col?.config?.mode === "json" ? { kind: "json" } : TUPLE_CLASS_SHAPES[String(col?.constructor?.name ?? "")];
+      const ctorName = String(col?.constructor?.name ?? "");
+      const fallbackShape = dbType === "JSON" || dbType === "JSONB" || col?.config?.mode === "json" ? { kind: "json" } : BYTE_STRING_CLASSES.has(ctorName) ? { kind: "byteString", length: declaredLength(col) } : TUPLE_CLASS_SHAPES[ctorName];
+      if (fallbackShape?.kind === "byteString") delete constraints.maxLength;
       const shape = (v1?.shape ?? fallbackShape)?.kind;
       const finalTs = v1?.tsType ?? tsType;
       const wide = (finalTs === "unknown" || finalTs === "any") && (!shape || shape === "custom");
@@ -880,12 +938,14 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     const relations = [];
     const enums = [];
     const columnEnums = [];
+    const viewTables = [];
     for (const [name, val] of Object.entries(exportsObj)) {
       try {
         const cols = this.getSymbol(val, "drizzle:Columns");
         if (cols && typeof cols === "object") {
           const table = this.analyzeTable(name, val, issues);
           tables.push(table);
+          if (isDrizzleView(val)) viewTables.push(table);
           for (const col of table.columns) {
             const enumVals = cols[col.name]?.enumValues;
             if (enumVals && enumVals.length) {
@@ -936,7 +996,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     let dialect = "unknown";
     const marks = /* @__PURE__ */ new Set();
     for (const [_, val] of Object.entries(exportsObj)) {
-      const cols = val?.[/* @__PURE__ */ Symbol.for("drizzle:Columns")];
+      const cols = this.getSymbol(val, "drizzle:Columns");
       if (!cols) continue;
       for (const c of Object.values(cols)) {
         const kind = c?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")];
@@ -953,6 +1013,9 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     else if (/MySql|Mysql/i.test(names)) dialect = "mysql";
     else if (/Pg|Postgres/i.test(names)) dialect = "postgres";
     else if (/Gel/i.test(names)) dialect = "gel";
+    if (dialect === "sqlite") {
+      for (const view of viewTables) view.readOnly = true;
+    }
     if (dialect === "unknown" && tables.length) {
       issues.push({
         code: "DRZL_ANL_DIALECT",
@@ -1098,6 +1161,7 @@ var index_default = SchemaAnalyzer;
 0 && (module.exports = {
   SchemaAnalyzer,
   describeV1Column,
+  isDrizzleView,
   isReadOnlyRelation,
   isRelationsV2,
   readRelationsV2

package/dist/index.d.cts

@@ -144,16 +144,44 @@ type ColumnShape =
     sqlType?: string;
 }
 /**
- * A string of `0`/`1`: Postgres `bit(n)`, MySQL `binary(n)`/`varbinary(n)`.
+ * A string of `0`/`1`: Postgres `bit(n)`, Cockroach `bit(n)`/`varbit(n)`.
  *
- * `exact` separates the two. A Postgres `bit(3)` is always three digits, while a MySQL
- * `varbinary(16)` is at most sixteen, so treating both as exact rejected the empty string on
- * every MySQL binary column.
+ * `exact` separates the two. A Postgres `bit(3)` is always three digits, while a Cockroach
+ * `varbit(16)` is at most sixteen, so treating both as exact rejects the empty string on every
+ * varying column.
+ *
+ * MySQL `binary(n)`/`varbinary(n)` used to be listed here and is not a bit string at all; see
+ * `byteString`.
  */
  | {
     kind: 'bitstring';
     length?: number;
     exact?: boolean;
+}
+/**
+ * MySQL/SingleStore `binary(n)`/`varbinary(n)`: arbitrary bytes, handed to the caller as a
+ * string.
+ *
+ * Asked of MySQL 8.4 through drizzle on both majors, on the same row of the same table: the
+ * driver hands up a Buffer, drizzle decodes it, and what the caller receives is a string on
+ * 0.45.2 and on 1.0.0-rc.4 alike. `instanceof Uint8Array` is false for all four column builders
+ * on both majors.
+ *
+ * `length` is the declared width and means two different things depending on direction, which
+ * is why it is carried raw here rather than as a `maxLength` or a `maxBytes`:
+ *
+ *   out   the decode is lossy, so n bytes become at most n code points. Measured: `<ff ff ff>`
+ *         in a varbinary(3) comes back as 3 code points that re-encode to 9 UTF-8 bytes, so a
+ *         byte cap applied to a select schema rejects a row the column itself returned.
+ *   in    the server counts the encoded bytes. Measured on varbinary(8): 8 ascii accepted, 9
+ *         refused, 2 emoji (8 bytes) accepted, 3 emoji (12 bytes) refused, so a code-point cap
+ *         applied to an insert schema accepts a write the server refuses.
+ *
+ * The generators pick which by mode.
+ */
+ | {
+    kind: 'byteString';
+    length?: number;
 };
 interface Key {
     name?: string;
@@ -231,6 +259,17 @@ interface AnalyzeOptions {
  * path below untouched.
  */
 declare function describeV1Column(column: any): Partial<Column> | null;
+/**
+ * Whether an export is a Drizzle view, of any dialect and on either major.
+ *
+ * Asked of `drizzle:ViewBaseConfig` rather than of `drizzle:IsDrizzleView`, which reads like the
+ * obvious question and is not there to be asked: the marker was introduced in 0.39.0, and a view
+ * built on 0.29.5, 0.33.0 or 0.36.4 answers undefined to it. The config is an own symbol on all
+ * eleven releases probed and on every view form measured, on both majors: the query-builder and
+ * explicit-column-list forms of pg view, pg materialized view, mysql view and sqlite view,
+ * `.existing()`, and the schema-qualified pg view and materialized view.
+ */
+declare function isDrizzleView(val: any): boolean;
 /**
  * Whether an export is a Relations v2 definition, from `defineRelations(schema, (r) => ...)`.
  *
@@ -402,4 +441,4 @@ declare class SchemaAnalyzer {
     analyze(opts?: AnalyzeOptions): Promise<Analysis>;
 }
 
-export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column, isReadOnlyRelation, isRelationsV2, readRelationsV2 };
+export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column, isDrizzleView, isReadOnlyRelation, isRelationsV2, readRelationsV2 };

package/dist/index.d.ts

@@ -144,16 +144,44 @@ type ColumnShape =
     sqlType?: string;
 }
 /**
- * A string of `0`/`1`: Postgres `bit(n)`, MySQL `binary(n)`/`varbinary(n)`.
+ * A string of `0`/`1`: Postgres `bit(n)`, Cockroach `bit(n)`/`varbit(n)`.
  *
- * `exact` separates the two. A Postgres `bit(3)` is always three digits, while a MySQL
- * `varbinary(16)` is at most sixteen, so treating both as exact rejected the empty string on
- * every MySQL binary column.
+ * `exact` separates the two. A Postgres `bit(3)` is always three digits, while a Cockroach
+ * `varbit(16)` is at most sixteen, so treating both as exact rejects the empty string on every
+ * varying column.
+ *
+ * MySQL `binary(n)`/`varbinary(n)` used to be listed here and is not a bit string at all; see
+ * `byteString`.
  */
  | {
     kind: 'bitstring';
     length?: number;
     exact?: boolean;
+}
+/**
+ * MySQL/SingleStore `binary(n)`/`varbinary(n)`: arbitrary bytes, handed to the caller as a
+ * string.
+ *
+ * Asked of MySQL 8.4 through drizzle on both majors, on the same row of the same table: the
+ * driver hands up a Buffer, drizzle decodes it, and what the caller receives is a string on
+ * 0.45.2 and on 1.0.0-rc.4 alike. `instanceof Uint8Array` is false for all four column builders
+ * on both majors.
+ *
+ * `length` is the declared width and means two different things depending on direction, which
+ * is why it is carried raw here rather than as a `maxLength` or a `maxBytes`:
+ *
+ *   out   the decode is lossy, so n bytes become at most n code points. Measured: `<ff ff ff>`
+ *         in a varbinary(3) comes back as 3 code points that re-encode to 9 UTF-8 bytes, so a
+ *         byte cap applied to a select schema rejects a row the column itself returned.
+ *   in    the server counts the encoded bytes. Measured on varbinary(8): 8 ascii accepted, 9
+ *         refused, 2 emoji (8 bytes) accepted, 3 emoji (12 bytes) refused, so a code-point cap
+ *         applied to an insert schema accepts a write the server refuses.
+ *
+ * The generators pick which by mode.
+ */
+ | {
+    kind: 'byteString';
+    length?: number;
 };
 interface Key {
     name?: string;
@@ -231,6 +259,17 @@ interface AnalyzeOptions {
  * path below untouched.
  */
 declare function describeV1Column(column: any): Partial<Column> | null;
+/**
+ * Whether an export is a Drizzle view, of any dialect and on either major.
+ *
+ * Asked of `drizzle:ViewBaseConfig` rather than of `drizzle:IsDrizzleView`, which reads like the
+ * obvious question and is not there to be asked: the marker was introduced in 0.39.0, and a view
+ * built on 0.29.5, 0.33.0 or 0.36.4 answers undefined to it. The config is an own symbol on all
+ * eleven releases probed and on every view form measured, on both majors: the query-builder and
+ * explicit-column-list forms of pg view, pg materialized view, mysql view and sqlite view,
+ * `.existing()`, and the schema-qualified pg view and materialized view.
+ */
+declare function isDrizzleView(val: any): boolean;
 /**
  * Whether an export is a Relations v2 definition, from `defineRelations(schema, (r) => ...)`.
  *
@@ -402,4 +441,4 @@ declare class SchemaAnalyzer {
     analyze(opts?: AnalyzeOptions): Promise<Analysis>;
 }
 
-export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column, isReadOnlyRelation, isRelationsV2, readRelationsV2 };
+export { type Analysis, type AnalyzeOptions, type Check, type Column, type ColumnRef, type ColumnShape, type Dialect, type Enum, type ForeignKey, type Index, type Issue, type Key, type Relation, SchemaAnalyzer, type Table, SchemaAnalyzer as default, describeV1Column, isDrizzleView, isReadOnlyRelation, isRelationsV2, readRelationsV2 };

package/dist/index.js

@@ -28,6 +28,13 @@ var TUPLE_CLASS_SHAPES = {
   PgPointTuple: { kind: "tuple", length: 2 },
   PgLineTuple: { kind: "tuple", length: 3 }
 };
+var V1_ONLY_ENTITY_KINDS = /^(?:MsSql|Cockroach)/;
+var BYTE_STRING_CLASSES = /* @__PURE__ */ new Set([
+  "MySqlBinary",
+  "MySqlVarBinary",
+  "SingleStoreBinary",
+  "SingleStoreVarBinary"
+]);
 function describeV1Column(column) {
   const codec = column?.codec;
   const dataType = column?.dataType;
@@ -40,8 +47,9 @@ function describeV1Column(column) {
       shape: { kind: "custom", sqlType: typeof sqlType === "string" ? sqlType : void 0 }
     };
   }
+  const entityKind = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
   const [js, semantic = ""] = dataType.split(" ");
-  if (typeof codec !== "string" && !semantic) return null;
+  if (typeof codec !== "string" && !semantic && !V1_ONLY_ENTITY_KINDS.test(entityKind)) return null;
   const out = {};
   switch (semantic) {
     case "int8":
@@ -77,7 +85,7 @@ function describeV1Column(column) {
     case "float":
     case "double": {
       if (semantic === "float")
-        [out.min, out.max] = codec === "float4" ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
+        [out.min, out.max] = codec === "float4" || entityKind.startsWith("Cockroach") ? PG_FLOAT4_RANGE : MYSQL_FLOAT_RANGE;
       out.integer = false;
       out.tsType = "number";
       out.dbType = semantic === "float" ? "REAL" : "DOUBLE";
@@ -127,17 +135,20 @@ function describeV1Column(column) {
       out.tsType = "string";
       out.dbType = semantic.toUpperCase();
       break;
-    case "binary":
+    case "binary": {
+      const entity = String(column?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
+      const bytes = entity.startsWith("MySql") || entity.startsWith("SingleStore");
       out.tsType = "string";
       out.dbType = codec === "bit" ? "BIT" : "BINARY";
-      out.shape = {
+      out.shape = bytes ? { kind: "byteString", length: declaredLength(column) } : {
         kind: "bitstring",
         length: declaredLength(column),
-        // A Postgres `bit(3)` holds exactly three digits; a MySQL `binary(4)`/`varbinary(16)`
-        // holds at most that many, which is why `''` is valid there and not here.
+        // A Postgres `bit(3)` holds exactly three digits; a Cockroach `varbit(16)` holds at
+        // most that many, which is why `''` is valid there and not here.
         exact: codec === "bit"
       };
       break;
+    }
     case "point":
     case "geometry":
       out.tsType = "[number, number]";
@@ -194,15 +205,33 @@ function declaredLength(column) {
   const n = column?.length ?? column?.config?.length ?? column?.config?.dimensions;
   return typeof n === "number" && Number.isFinite(n) && n > 0 ? n : void 0;
 }
-function getSymbolOf(target, key) {
-  if (!target) return void 0;
+var VIEW_CONFIG_FIELDS = {
+  "drizzle:Columns": "selectedFields",
+  "drizzle:Name": "name",
+  "drizzle:Schema": "schema"
+};
+function ownSymbolOf(target, key) {
   try {
     for (const sym of Object.getOwnPropertySymbols(target)) {
       if (sym.description === key) return target[sym];
     }
   } catch {
   }
-  return target[Symbol.for(key)];
+  return void 0;
+}
+function getSymbolOf(target, key) {
+  if (!target) return void 0;
+  const own = ownSymbolOf(target, key);
+  if (own !== void 0) return own;
+  const direct = target[Symbol.for(key)];
+  if (direct !== void 0) return direct;
+  const field = VIEW_CONFIG_FIELDS[key];
+  if (!field) return void 0;
+  const cfg = ownSymbolOf(target, "drizzle:ViewBaseConfig");
+  return cfg ? cfg[field] : void 0;
+}
+function isDrizzleView(val) {
+  return !!val && typeof val === "object" && !!getSymbolOf(val, "drizzle:ViewBaseConfig");
 }
 function isReadOnlyRelation(val) {
   if (!val || typeof val !== "object") return false;
@@ -246,17 +275,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     this.schemaPath = schemaPath;
   }
   getSymbol(table, key) {
-    if (!table) return void 0;
-    try {
-      const syms = Object.getOwnPropertySymbols(table);
-      for (const s of syms) {
-        if (s.description === key) {
-          return table[s];
-        }
-      }
-    } catch {
-    }
-    return table[Symbol.for(key)];
+    return getSymbolOf(table, key);
   }
   /**
    * Drizzle keys the Columns object by TypeScript property name, but every other piece of
@@ -505,6 +524,14 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         return { tsType: "bigint", dbType: "BIGINT" };
       case "SQLiteNumeric":
         return { tsType: "string", dbType: "NUMERIC" };
+      // The other two modes of the same column, which matched no arm here and no dialect regex
+      // below either, so both came back UNKNOWN and every generator emitted a schema that
+      // accepted anything at all. Read back through better-sqlite3 3.53.4 on a `numeric` column,
+      // `db.select()` hands back a number in number mode and a bigint in bigint mode.
+      case "SQLiteNumericNumber":
+        return { tsType: "number", dbType: "NUMERIC" };
+      case "SQLiteNumericBigInt":
+        return { tsType: "bigint", dbType: "NUMERIC" };
       case "SQLiteBoolean":
         return { tsType: "boolean", dbType: "INTEGER" };
       // 0.4x gives an enum its own class, which had no arm here at all, so an enum column came
@@ -549,6 +576,15 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
         return { tsType: "Date", dbType: "TIMESTAMP" };
       case "PgNumeric":
         return { tsType: "string", dbType: "NUMERIC" };
+      // The other two modes, each its own class. `PgNumericNumber` reached the coarse
+      // `/Numeric|Float|Double|Real/i` arm and got the right answer there; `PgNumericBigInt` got
+      // its `bigint` from the `/BigInt/i` arm meant for `bigint` columns, and the SQL label that
+      // comes with it, so a `numeric(20,0)` was reported as a BIGINT column. Read back through
+      // PGlite, `db.select()` hands back a number in number mode and a bigint in bigint mode.
+      case "PgNumericNumber":
+        return { tsType: "number", dbType: "NUMERIC" };
+      case "PgNumericBigInt":
+        return { tsType: "bigint", dbType: "NUMERIC" };
       case "PgDoublePrecision":
         return { tsType: "number", dbType: "DOUBLE" };
       // `real()` builds a `PgReal`, which matched no arm and fell through to the coarse
@@ -571,6 +607,16 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       case "PgJson":
       case "PgJsonb":
         return { tsType: "any", dbType: ctor === "PgJsonb" ? "JSONB" : "JSON" };
+      // The four builders in `BYTE_STRING_CLASSES`, which the coarse `/Blob|Binary|VarBinary/i`
+      // arms below would otherwise call a `Uint8Array` on the strength of the word "Binary" in
+      // the class name. Asked of MySQL 8.4 through drizzle 0.45.2 instead: the driver hands up a
+      // Buffer, `mapFromDriverValue` decodes it, and the caller receives a string. Every one of
+      // the four declares `dataType: 'string'` and every one of the four defines that method.
+      case "MySqlBinary":
+      case "MySqlVarBinary":
+      case "SingleStoreBinary":
+      case "SingleStoreVarBinary":
+        return { tsType: "string", dbType: "BINARY" };
       default:
         if (column?.config?.mode === "timestamp" || column?.mode === "timestamp") {
           return { tsType: "Date", dbType: "INTEGER" };
@@ -598,7 +644,12 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/BigInt64/i.test(ctor)) return { tsType: "bigint", dbType: "BIGINT" };
           if (/BigInt53/i.test(ctor)) return { tsType: "number", dbType: "BIGINT" };
           if (/\bBigInt\b/i.test(ctor)) return { tsType: "bigint", dbType: "BIGINT" };
-          if (/Decimal|Numeric|Float|Double|Real/i.test(ctor))
+          if (/Decimal/i.test(ctor)) {
+            if (/DecimalNumber$/.test(ctor)) return { tsType: "number", dbType: "NUMERIC" };
+            if (/DecimalBigInt$/.test(ctor)) return { tsType: "bigint", dbType: "NUMERIC" };
+            return { tsType: "string", dbType: "NUMERIC" };
+          }
+          if (/Numeric|Float|Double|Real/i.test(ctor))
             return { tsType: "number", dbType: "NUMERIC" };
           if (/Int|Serial|TinyInt|SmallInt|MediumInt/i.test(ctor))
             return { tsType: "number", dbType: "INTEGER" };
@@ -617,7 +668,12 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/Vector/i.test(ctor)) return { tsType: "any", dbType: "VECTOR" };
           if (/BigInt64/i.test(ctor)) return { tsType: "bigint", dbType: "BIGINT" };
           if (/BigInt53/i.test(ctor)) return { tsType: "number", dbType: "BIGINT" };
-          if (/Decimal|Numeric|Float|Double|Real/i.test(ctor))
+          if (/Decimal/i.test(ctor)) {
+            if (/DecimalNumber$/.test(ctor)) return { tsType: "number", dbType: "NUMERIC" };
+            if (/DecimalBigInt$/.test(ctor)) return { tsType: "bigint", dbType: "NUMERIC" };
+            return { tsType: "string", dbType: "NUMERIC" };
+          }
+          if (/Numeric|Float|Double|Real/i.test(ctor))
             return { tsType: "number", dbType: "NUMERIC" };
           if (/Int|Serial|TinyInt|SmallInt|MediumInt/i.test(ctor))
             return { tsType: "number", dbType: "INTEGER" };
@@ -641,11 +697,10 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
           if (/Json/i.test(ctor)) return { tsType: "any", dbType: "JSON" };
           if (/Text/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
           if (/Bytes/i.test(ctor)) return { tsType: "Uint8Array", dbType: "BLOB" };
+          if (/Bool/i.test(ctor)) return { tsType: "boolean", dbType: "BOOLEAN" };
           if (/TimestampTz/i.test(ctor)) return { tsType: "Date", dbType: "TIMESTAMPTZ" };
-          if (/Timestamp/i.test(ctor)) return { tsType: "string", dbType: "TIMESTAMP" };
-          if (/LocalDateString|LocalTime/i.test(ctor)) return { tsType: "string", dbType: "TEXT" };
-          if (/DateDuration|RelDuration|Duration/i.test(ctor))
-            return { tsType: "string", dbType: "TEXT" };
+          if (/Timestamp|LocalDateString|LocalTime|DateDuration|RelDuration|Duration/i.test(ctor))
+            return { tsType: "unknown", dbType: "UNKNOWN" };
         }
         return { tsType: "unknown", dbType: "UNKNOWN" };
     }
@@ -690,7 +745,9 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
       const sqlKind = String(outerCol?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")] ?? "");
       const sqlType = sqlKind.startsWith("MySql") && typeof col?.getSQLType === "function" ? String(col.getSQLType()).toLowerCase() : void 0;
       const byteCap = sqlType ? MYSQL_TEXT_CAPS[sqlType] : void 0;
-      const fallbackShape = dbType === "JSON" || dbType === "JSONB" || col?.config?.mode === "json" ? { kind: "json" } : TUPLE_CLASS_SHAPES[String(col?.constructor?.name ?? "")];
+      const ctorName = String(col?.constructor?.name ?? "");
+      const fallbackShape = dbType === "JSON" || dbType === "JSONB" || col?.config?.mode === "json" ? { kind: "json" } : BYTE_STRING_CLASSES.has(ctorName) ? { kind: "byteString", length: declaredLength(col) } : TUPLE_CLASS_SHAPES[ctorName];
+      if (fallbackShape?.kind === "byteString") delete constraints.maxLength;
       const shape = (v1?.shape ?? fallbackShape)?.kind;
       const finalTs = v1?.tsType ?? tsType;
       const wide = (finalTs === "unknown" || finalTs === "any") && (!shape || shape === "custom");
@@ -840,12 +897,14 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     const relations = [];
     const enums = [];
     const columnEnums = [];
+    const viewTables = [];
     for (const [name, val] of Object.entries(exportsObj)) {
       try {
         const cols = this.getSymbol(val, "drizzle:Columns");
         if (cols && typeof cols === "object") {
           const table = this.analyzeTable(name, val, issues);
           tables.push(table);
+          if (isDrizzleView(val)) viewTables.push(table);
           for (const col of table.columns) {
             const enumVals = cols[col.name]?.enumValues;
             if (enumVals && enumVals.length) {
@@ -896,7 +955,7 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     let dialect = "unknown";
     const marks = /* @__PURE__ */ new Set();
     for (const [_, val] of Object.entries(exportsObj)) {
-      const cols = val?.[/* @__PURE__ */ Symbol.for("drizzle:Columns")];
+      const cols = this.getSymbol(val, "drizzle:Columns");
       if (!cols) continue;
       for (const c of Object.values(cols)) {
         const kind = c?.constructor?.[/* @__PURE__ */ Symbol.for("drizzle:entityKind")];
@@ -913,6 +972,9 @@ var _SchemaAnalyzer = class _SchemaAnalyzer {
     else if (/MySql|Mysql/i.test(names)) dialect = "mysql";
     else if (/Pg|Postgres/i.test(names)) dialect = "postgres";
     else if (/Gel/i.test(names)) dialect = "gel";
+    if (dialect === "sqlite") {
+      for (const view of viewTables) view.readOnly = true;
+    }
     if (dialect === "unknown" && tables.length) {
       issues.push({
         code: "DRZL_ANL_DIALECT",
@@ -1058,6 +1120,7 @@ export {
   SchemaAnalyzer,
   index_default as default,
   describeV1Column,
+  isDrizzleView,
   isReadOnlyRelation,
   isRelationsV2,
   readRelationsV2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drzl/analyzer",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",