@quereus/quereus 0.5.2 → 0.6.1

package/src/core/param.ts

@@ -1,5 +1,6 @@
 import type { ScalarType } from '../common/datatype.js';
-import { type SqlParameters, type SqlValue, SqlDataType } from '../common/types.js';
+import { type SqlParameters, type SqlValue } from '../common/types.js';
+import { inferLogicalTypeFromValue } from '../common/type-inference.js';
 
 export function getParameterTypeHints(params: SqlParameters | undefined): Map<string | number, ScalarType> | undefined {
 	let results: Map<string | number, ScalarType> | undefined;
@@ -22,20 +23,12 @@ export function getParameterTypeHints(params: SqlParameters | undefined): Map<st
 }
 
 function getParameterScalarType(value: SqlValue): ScalarType {
-	let affinity: SqlDataType;
-	if (value === null) affinity = SqlDataType.NULL;
-	else if (typeof value === 'number') affinity = SqlDataType.REAL;
-	else if (typeof value === 'bigint') affinity = SqlDataType.INTEGER;
-	else if (typeof value === 'string') affinity = SqlDataType.TEXT;
-	else if (value instanceof Uint8Array) affinity = SqlDataType.BLOB;
-	else if (typeof value === 'boolean') affinity = SqlDataType.INTEGER;
-	else affinity = SqlDataType.BLOB;
+	const logicalType = inferLogicalTypeFromValue(value);
 
 	return {
 		typeClass: 'scalar',
-		affinity: affinity,
+		logicalType,
 		nullable: value === null,
 		isReadOnly: true,
-		datatype: affinity,
 	};
 }

package/src/func/builtins/aggregate.ts

@@ -87,7 +87,18 @@ export const avgFunc = createAggregateFunction(
 
 // --- MIN(X) ---
 export const minFunc = createAggregateFunction(
-	{ name: 'min', numArgs: 1, initialValue: null },
+	{
+		name: 'min',
+		numArgs: 1,
+		initialValue: null,
+		// Type inference: return the same type as the input argument
+		inferReturnType: (argTypes) => ({
+			typeClass: 'scalar',
+			logicalType: argTypes[0],
+			nullable: true, // MIN can return NULL if all values are NULL or no rows
+			isReadOnly: true
+		})
+	},
 	(acc: { min: SqlValue } | null, value: SqlValue): { min: SqlValue } | null => {
 		if (value === null) return acc; // Ignore NULLs
 		if (acc === null) return { min: value }; // First non-null value
@@ -100,7 +111,18 @@ export const minFunc = createAggregateFunction(
 
 // --- MAX(X) ---
 export const maxFunc = createAggregateFunction(
-	{ name: 'max', numArgs: 1, initialValue: null },
+	{
+		name: 'max',
+		numArgs: 1,
+		initialValue: null,
+		// Type inference: return the same type as the input argument
+		inferReturnType: (argTypes) => ({
+			typeClass: 'scalar',
+			logicalType: argTypes[0],
+			nullable: true, // MAX can return NULL if all values are NULL or no rows
+			isReadOnly: true
+		})
+	},
 	(acc: { max: SqlValue } | null, value: SqlValue): { max: SqlValue } | null => {
 		if (value === null) return acc; // Ignore NULLs
 		if (acc === null) return { max: value }; // First non-null value

package/src/func/builtins/builtin-window-functions.ts

@@ -1,6 +1,6 @@
 import { registerWindowFunction } from '../../schema/window-function.js';
-import { SqlDataType } from '../../common/types.js';
 import { AggValue } from '../registration.js';
+import { INTEGER_TYPE, REAL_TYPE } from '../../types/builtin-types.js';
 
 // Built-in window function schemas
 export function registerBuiltinWindowFunctions(): void {
@@ -10,7 +10,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 0,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.INTEGER,
+			logicalType: INTEGER_TYPE,
 			nullable: false,
 			isReadOnly: true
 		},
@@ -23,7 +23,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 0,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.INTEGER,
+			logicalType: INTEGER_TYPE,
 			nullable: false,
 			isReadOnly: true
 		},
@@ -36,7 +36,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 0,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.INTEGER,
+			logicalType: INTEGER_TYPE,
 			nullable: false,
 			isReadOnly: true
 		},
@@ -49,7 +49,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 1,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.INTEGER,
+			logicalType: INTEGER_TYPE,
 			nullable: false,
 			isReadOnly: true
 		},
@@ -63,7 +63,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 1,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.INTEGER,
+			logicalType: INTEGER_TYPE,
 			nullable: false,
 			isReadOnly: true
 		},
@@ -83,7 +83,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 1,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.NUMERIC,
+			logicalType: REAL_TYPE,
 			nullable: true,
 			isReadOnly: true
 		},
@@ -104,7 +104,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 1,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.NUMERIC,
+			logicalType: REAL_TYPE,
 			nullable: true,
 			isReadOnly: true
 		},
@@ -127,7 +127,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 1,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.NUMERIC,
+			logicalType: REAL_TYPE,
 			nullable: true,
 			isReadOnly: true
 		},
@@ -148,7 +148,7 @@ export function registerBuiltinWindowFunctions(): void {
 		argCount: 1,
 		returnType: {
 			typeClass: 'scalar',
-			affinity: SqlDataType.NUMERIC,
+			logicalType: REAL_TYPE,
 			nullable: true,
 			isReadOnly: true
 		},

package/src/func/builtins/conversion.ts

@@ -3,7 +3,7 @@ import { createScalarFunction } from '../registration.js';
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { INTEGER_TYPE, REAL_TYPE, TEXT_TYPE, BOOLEAN_TYPE } from '../../types/builtin-types.js';
-import { DATE_TYPE, TIME_TYPE, DATETIME_TYPE } from '../../types/temporal-types.js';
+import { DATE_TYPE, TIME_TYPE, DATETIME_TYPE, TIMESPAN_TYPE } from '../../types/temporal-types.js';
 import { JSON_TYPE } from '../../types/json-type.js';
 
 /**
@@ -199,3 +199,28 @@ export const JSON_FUNC = createScalarFunction(
 	}
 );
 
+/**
+ * timespan() - Convert value to TIMESPAN
+ * Usage: timespan(value)
+ *
+ * Accepts:
+ * - ISO 8601 duration strings: 'PT1H30M', 'P1D', 'P1Y2M3D'
+ * - Human-readable strings: '1 hour', '30 minutes', '2 days 3 hours'
+ * - Numeric values (interpreted as seconds): 3600, 86400
+ */
+export const TIMESPAN_FUNC = createScalarFunction(
+	{ name: 'timespan', numArgs: 1, deterministic: true },
+	(value: SqlValue): SqlValue => {
+		if (value === null) return null;
+
+		try {
+			return TIMESPAN_TYPE.parse!(value);
+		} catch (e) {
+			throw new QuereusError(
+				`Cannot convert to TIMESPAN: ${e instanceof Error ? e.message : String(e)}`,
+				StatusCode.MISMATCH
+			);
+		}
+	}
+);
+

package/src/func/builtins/datetime.ts

@@ -456,14 +456,14 @@ export const strftimeFunc = createScalarFunction(
 export const isISODateFunc = createScalarFunction(
 	{ name: 'IsISODate', numArgs: 1, deterministic: true },
 	(value: SqlValue): SqlValue => {
-		if (typeof value !== 'string') return 0;
+		if (typeof value !== 'string') return false;
 		const s = value.trim();
-		if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return 0;
+		if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return false;
 		try {
 			const d = Temporal.PlainDate.from(s);
-			return d.toString() === s ? 1 : 0;
+			return d.toString() === s;
 		} catch {
-			return 0;
+			return false;
 		}
 	}
 );
@@ -472,24 +472,24 @@ export const isISODateFunc = createScalarFunction(
 export const isISODateTimeFunc = createScalarFunction(
 	{ name: 'IsISODateTime', numArgs: 1, deterministic: true },
 	(value: SqlValue): SqlValue => {
-		if (typeof value !== 'string') return 0;
+		if (typeof value !== 'string') return false;
 		const s = value.trim();
 		// YYYY-MM-DDTHH:MM[:SS[.fraction]] [timezone]
 		const re =
 			/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,9})?)?(?:Z|[+-]\d{2}:\d{2})?$/;
-		if (!re.test(s)) return 0;
+		if (!re.test(s)) return false;
 		const hasZone = /(?:Z|[+-]\d{2}:\d{2})$/.test(s);
 		try {
 			if (hasZone) {
 				// Zoned ISO string
 				void Temporal.Instant.from(s);
-				return 1;
+				return true;
 			}
 			// Plain ISO local date-time
 			void Temporal.PlainDateTime.from(s);
-			return 1;
+			return true;
 		} catch {
-			return 0;
+			return false;
 		}
 	}
 );

package/src/func/builtins/explain.ts

@@ -1,7 +1,7 @@
 import type { Row } from "../../common/types.js";
 import type { SqlValue } from "../../common/types.js";
-import { SqlDataType } from "../../common/types.js";
 import { createIntegratedTableValuedFunction } from "../registration.js";
+import { INTEGER_TYPE, REAL_TYPE, TEXT_TYPE } from "../../types/builtin-types.js";
 import { QuereusError } from "../../common/errors.js";
 import { StatusCode } from "../../common/types.js";
 import type { Database } from "../../core/database.js";
@@ -81,18 +81,18 @@ export const queryPlanFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'id', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'parent_id', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'subquery_level', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'node_type', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'op', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'detail', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'object_name', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'alias', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'properties', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'physical', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'est_cost', type: { typeClass: 'scalar', affinity: SqlDataType.REAL, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'est_rows', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true }
+				{ name: 'id', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'parent_id', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'subquery_level', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'node_type', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'op', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'detail', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'object_name', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'alias', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'properties', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'physical', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'est_cost', type: { typeClass: 'scalar', logicalType: REAL_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'est_rows', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []
@@ -200,12 +200,12 @@ export const schedulerProgramFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'addr', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'dependencies', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true }, // JSON array of dependency IDs
-				{ name: 'description', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'estimated_cost', type: { typeClass: 'scalar', affinity: SqlDataType.REAL, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'is_subprogram', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true }, // 0/1 boolean
-				{ name: 'parent_addr', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true }
+				{ name: 'addr', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'dependencies', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true }, // JSON array of dependency IDs
+				{ name: 'description', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'estimated_cost', type: { typeClass: 'scalar', logicalType: REAL_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'is_subprogram', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true }, // 0/1 boolean
+				{ name: 'parent_addr', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []
@@ -280,13 +280,13 @@ export const stackTraceFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'frame_id', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'depth', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'location', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'plan_node_type', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'operation', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'table_or_function', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'is_virtual', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true } // 0/1 boolean
+				{ name: 'frame_id', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'depth', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'location', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'plan_node_type', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'operation', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'table_or_function', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'is_virtual', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true } // 0/1 boolean
 			],
 			keys: [],
 			rowConstraints: []
@@ -387,15 +387,15 @@ export const executionTraceFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'instruction_index', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'operation', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'dependencies', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true }, // JSON array of instruction indices this depends on
-				{ name: 'input_values', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true }, // JSON
-				{ name: 'output_value', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true }, // JSON
-				{ name: 'duration_ms', type: { typeClass: 'scalar', affinity: SqlDataType.REAL, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'sub_programs', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true }, // JSON
-				{ name: 'error_message', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'timestamp_ms', type: { typeClass: 'scalar', affinity: SqlDataType.REAL, nullable: false, isReadOnly: true }, generated: true }
+				{ name: 'instruction_index', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'operation', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'dependencies', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true }, // JSON array of instruction indices this depends on
+				{ name: 'input_values', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true }, // JSON
+				{ name: 'output_value', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true }, // JSON
+				{ name: 'duration_ms', type: { typeClass: 'scalar', logicalType: REAL_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'sub_programs', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true }, // JSON
+				{ name: 'error_message', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'timestamp_ms', type: { typeClass: 'scalar', logicalType: REAL_TYPE, nullable: false, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []
@@ -563,12 +563,12 @@ export const rowTraceFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'instruction_index', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'operation', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'row_index', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'row_data', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true }, // JSON array of row values
-				{ name: 'timestamp_ms', type: { typeClass: 'scalar', affinity: SqlDataType.REAL, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'row_count', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true } // Total rows for this instruction (filled in last row)
+				{ name: 'instruction_index', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'operation', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'row_index', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'row_data', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true }, // JSON array of row values
+				{ name: 'timestamp_ms', type: { typeClass: 'scalar', logicalType: REAL_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'row_count', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true } // Total rows for this instruction (filled in last row)
 			],
 			keys: [],
 			rowConstraints: []
@@ -671,12 +671,12 @@ export const schemaSizeFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'object_type', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'object_name', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'estimated_rows', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'estimated_size_kb', type: { typeClass: 'scalar', affinity: SqlDataType.REAL, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'column_count', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'index_count', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true }
+				{ name: 'object_type', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'object_name', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'estimated_rows', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'estimated_size_kb', type: { typeClass: 'scalar', logicalType: REAL_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'column_count', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'index_count', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []
@@ -698,12 +698,12 @@ export const explainAssertionFunc = createIntegratedTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'assertion', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'relation_key', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'base', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'classification', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'prepared_pk_params', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true }, // JSON array of param names or NULL
-				{ name: 'violation_sql', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true }
+				{ name: 'assertion', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'relation_key', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'base', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'classification', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'prepared_pk_params', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true }, // JSON array of param names or NULL
+				{ name: 'violation_sql', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []

package/src/func/builtins/generation.ts

@@ -1,7 +1,7 @@
 import type { Row } from "../../common/types.js";
 import type { SqlValue } from "../../common/types.js";
-import { SqlDataType } from "../../common/types.js";
 import { createTableValuedFunction } from "../registration.js";
+import { INTEGER_TYPE } from "../../types/builtin-types.js";
 
 // Generate a sequence of numbers (table-valued function)
 export const generateSeriesFunc = createTableValuedFunction(
@@ -18,7 +18,7 @@ export const generateSeriesFunc = createTableValuedFunction(
 					name: 'value',
 					type: {
 						typeClass: 'scalar',
-						affinity: SqlDataType.INTEGER,
+						logicalType: INTEGER_TYPE,
 						nullable: false,
 						isReadOnly: true
 					},

package/src/func/builtins/index.ts

@@ -21,7 +21,12 @@ import { generateSeriesFunc } from './generation.js';
 import { queryPlanFunc, schedulerProgramFunc, stackTraceFunc, executionTraceFunc, rowTraceFunc, explainAssertionFunc } from './explain.js';
 import { schemaFunc, tableInfoFunc, functionInfoFunc } from './schema.js';
 import { jsonEachFunc, jsonTreeFunc } from './json-tvf.js';
-import { INTEGER_FUNC, REAL_FUNC, TEXT_FUNC, BOOLEAN_FUNC, DATE_FUNC, TIME_FUNC, DATETIME_FUNC, JSON_FUNC } from './conversion.js';
+import { INTEGER_FUNC, REAL_FUNC, TEXT_FUNC, BOOLEAN_FUNC, DATE_FUNC, TIME_FUNC, DATETIME_FUNC, TIMESPAN_FUNC, JSON_FUNC } from './conversion.js';
+import {
+	timespanYearsFunc, timespanMonthsFunc, timespanWeeksFunc, timespanDaysFunc,
+	timespanHoursFunc, timespanMinutesFunc, timespanSecondsFunc,
+	timespanTotalSecondsFunc, timespanTotalMinutesFunc, timespanTotalHoursFunc, timespanTotalDaysFunc
+} from './timespan.js';
 
 // Additional useful functions integrated from examples
 
@@ -35,6 +40,7 @@ export const BUILTIN_FUNCTIONS: FunctionSchema[] = [
 	DATE_FUNC,
 	TIME_FUNC,
 	DATETIME_FUNC,
+	TIMESPAN_FUNC,
 	// Scalar Functions
 	absFunc,
 	roundFunc,
@@ -93,6 +99,18 @@ export const BUILTIN_FUNCTIONS: FunctionSchema[] = [
 	strftimeFunc,
 	isISODateFunc,
 	isISODateTimeFunc,
+	// Timespan Functions
+	timespanYearsFunc,
+	timespanMonthsFunc,
+	timespanWeeksFunc,
+	timespanDaysFunc,
+	timespanHoursFunc,
+	timespanMinutesFunc,
+	timespanSecondsFunc,
+	timespanTotalSecondsFunc,
+	timespanTotalMinutesFunc,
+	timespanTotalHoursFunc,
+	timespanTotalDaysFunc,
 	// JSON Functions
 	jsonValidFunc,
 	jsonSchemaFunc,
@@ -136,6 +154,7 @@ export const BUILTIN_FUNCTIONS: FunctionSchema[] = [
 	DATE_FUNC,
 	TIME_FUNC,
 	DATETIME_FUNC,
+	TIMESPAN_FUNC,
 	JSON_FUNC,
 ];
 

package/src/func/builtins/json-tvf.ts

@@ -1,10 +1,10 @@
 import type { Row, SqlValue, JSONValue } from "../../common/types.js";
-import { SqlDataType } from "../../common/types.js";
 import { createTableValuedFunction } from "../registration.js";
 import { QuereusError } from "../../common/errors.js";
 import { StatusCode } from "../../common/types.js";
 import { safeJsonParse, evaluateJsonPathBasic, getJsonType } from "./json-helpers.js";
 import { jsonStringify } from "../../util/serialization.js";
+import { INTEGER_TYPE, TEXT_TYPE } from "../../types/builtin-types.js";
 
 // JSON Each table-valued function
 export const jsonEachFunc = createTableValuedFunction(
@@ -17,14 +17,14 @@ export const jsonEachFunc = createTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'key', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'value', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'type', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'atom', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'id', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'parent', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'fullkey', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'path', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true }
+				{ name: 'key', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'value', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'type', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'atom', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'id', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'parent', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'fullkey', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'path', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []
@@ -119,14 +119,14 @@ export const jsonTreeFunc = createTableValuedFunction(
 			isReadOnly: true,
 			isSet: false,
 			columns: [
-				{ name: 'key', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'value', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'type', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'atom', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'id', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'parent', type: { typeClass: 'scalar', affinity: SqlDataType.INTEGER, nullable: true, isReadOnly: true }, generated: true },
-				{ name: 'fullkey', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true },
-				{ name: 'path', type: { typeClass: 'scalar', affinity: SqlDataType.TEXT, nullable: false, isReadOnly: true }, generated: true }
+				{ name: 'key', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'value', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'type', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'atom', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'id', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'parent', type: { typeClass: 'scalar', logicalType: INTEGER_TYPE, nullable: true, isReadOnly: true }, generated: true },
+				{ name: 'fullkey', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true },
+				{ name: 'path', type: { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: false, isReadOnly: true }, generated: true }
 			],
 			keys: [],
 			rowConstraints: []

package/src/func/builtins/json.ts

@@ -26,7 +26,7 @@ const errorLog = log.extend('error');
 export const jsonValidFunc = createScalarFunction(
 	{ name: 'json_valid', numArgs: 1, deterministic: true },
 	(json: SqlValue): SqlValue => {
-		return safeJsonParse(json) !== null ? 1 : 0;
+		return safeJsonParse(json) !== null;
 	}
 );
 
@@ -65,23 +65,23 @@ function emitJsonSchema(
 				// The validator is captured in the closure, so it lives with the plan
 				function run(_rctx: RuntimeContext, ...args: any[]): SqlValue {
 					const json = args[0];
-					if (typeof json !== 'string') return 0;
+					if (typeof json !== 'string') return false;
 
 					let data: JSONValue | null;
 					try {
 						data = JSON.parse(json) as JSONValue;
 					} catch {
-						return 0; // Invalid JSON
+						return false; // Invalid JSON
 					}
 
 					// Use the cached compiled validator
 					try {
 						// moat-maker's .matches() returns true if valid, false otherwise
 						const isValid = compiledValidator.matches(data);
-						return isValid ? 1 : 0;
+						return isValid;
 					} catch (e) {
 						errorLog('json_schema validation failed: %O', e);
-						return 0;
+						return false;
 					}
 				}
 
@@ -111,16 +111,16 @@ export const jsonSchemaFunc = createScalarFunction(
 		// (e.g., during direct function calls outside of query execution)
 
 		// Schema definition must be a string
-		if (typeof schemaDef !== 'string') return 0;
+		if (typeof schemaDef !== 'string') return false;
 
 		// Parse the JSON value - need to check if it's valid JSON first
-		if (typeof json !== 'string') return 0;
+		if (typeof json !== 'string') return false;
 
 		let data: JSONValue | null;
 		try {
 			data = JSON.parse(json) as JSONValue;
 		} catch {
-			return 0; // Invalid JSON
+			return false; // Invalid JSON
 		}
 
 		// Compile and validate using moat-maker (no caching in fallback path)
@@ -130,10 +130,10 @@ export const jsonSchemaFunc = createScalarFunction(
 			const compiledValidator = validator(parts, ...[]);
 			// moat-maker's .matches() returns true if valid, false otherwise
 			const isValid = compiledValidator.matches(data);
-			return isValid ? 1 : 0;
+			return isValid;
 		} catch (e) {
 			errorLog('json_schema validation failed: %O', e);
-			return 0;
+			return false;
 		}
 	}
 );
@@ -191,7 +191,7 @@ export const jsonExtractFunc = createScalarFunction(
 		} else if (extractedValue === null) {
 			return null;
 		} else if (typeof extractedValue === 'boolean') {
-			return extractedValue ? 1 : 0;
+			return extractedValue;
 		} else if (typeof extractedValue === 'number') {
 			return extractedValue; // Return as INTEGER or REAL
 		} else if (typeof extractedValue === 'string') {