squirreling 0.12.19 → 0.12.20

package/README.md

@@ -161,7 +161,7 @@ Squirreling mostly follows the SQL standard. The following features are supporte
 - Trig: `SIN`, `COS`, `TAN`, `COT`, `ASIN`, `ACOS`, `ATAN`, `ATAN2`, `DEGREES`, `RADIANS`, `PI`
 - Date: `CURRENT_DATE`, `CURRENT_TIME`, `CURRENT_TIMESTAMP`, `DATE_DIFF`, `DATEDIFF`, `DATE_PART`, `DATE_TRUNC`, `EPOCH`, `EXTRACT`, `INTERVAL`
 - Json: `JSON_VALUE`, `JSON_QUERY`, `JSON_EXTRACT`, `JSON_OBJECT`, `JSON_ARRAY_LENGTH`, `JSON_VALID`, `JSON_TYPE`
-- Array: `ARRAY_LENGTH`, `ARRAY_POSITION`, `ARRAY_CONTAINS`, `ARRAY_SORT`, `CARDINALITY`, `SIZE`
+- Array: `ARRAY_LENGTH`, `ARRAY_POSITION`, `ARRAY_CONTAINS`, `ARRAY_SORT`, `ARRAY_APPEND`, `ARRAY_CONCAT`, `LEN`, `CARDINALITY`, `SIZE`
 - Table functions: `UNNEST`, `EXPLODE`, `JSON_EACH`
 - Regex: `REGEXP_SUBSTR`, `REGEXP_EXTRACT`, `REGEXP_REPLACE`, `REGEXP_MATCHES`
 - Spatial: `ST_GeomFromText`, `ST_MakeEnvelope`, `ST_AsText`, `ST_Intersects`, `ST_Contains`, `ST_ContainsProperly`, `ST_Within`, `ST_Overlaps`, `ST_Touches`, `ST_Equals`, `ST_Crosses`, `ST_Covers`, `ST_CoveredBy`, `ST_DWithin`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squirreling",
-  "version": "0.12.19",
+  "version": "0.12.20",
   "description": "Squirreling Async SQL Engine",
   "author": "Hyperparam",
   "homepage": "https://hyperparam.app",
@@ -39,11 +39,11 @@
     "test": "vitest run"
   },
   "devDependencies": {
-    "@types/node": "25.6.2",
-    "@vitest/coverage-v8": "4.1.5",
+    "@types/node": "25.8.0",
+    "@vitest/coverage-v8": "4.1.6",
     "eslint": "9.39.4",
     "eslint-plugin-jsdoc": "62.9.0",
     "typescript": "6.0.3",
-    "vitest": "4.1.5"
+    "vitest": "4.1.6"
   }
 }

package/src/execute/utils.js

@@ -27,7 +27,11 @@ export function compareForTerm(a, b, term) {
   if (a == b) return 0
 
   let cmp
-  if (primitiveTypes.has(typeof a) && primitiveTypes.has(typeof b)) {
+  if (a instanceof Date && b instanceof Date) {
+    const at = a.getTime()
+    const bt = b.getTime()
+    cmp = at < bt ? -1 : at > bt ? 1 : 0
+  } else if (primitiveTypes.has(typeof a) && primitiveTypes.has(typeof b)) {
     cmp = a < b ? -1 : 1
   } else {
     const aa = String(a)
@@ -121,6 +125,19 @@ export function maxBounds(a, b) {
   return a ?? b
 }
 
+/**
+ * SQL equality for primitives. Two Date instances for the same instant compare
+ * equal (JS `==` would compare by identity).
+ *
+ * @param {SqlPrimitive} a
+ * @param {SqlPrimitive} b
+ * @returns {boolean}
+ */
+export function sqlEquals(a, b) {
+  if (a instanceof Date && b instanceof Date) return a.getTime() === b.getTime()
+  return a == b
+}
+
 /**
  * Returns true for plain object SqlPrimitive values, excluding null, arrays, and Dates.
  *

package/src/expression/binary.js

@@ -29,6 +29,18 @@ export function applyBinaryOp(op, a, b) {
   }
   if (op === 'AND') return Boolean(a) && Boolean(b)
   if (op === 'OR') return Boolean(a) || Boolean(b)
+  // Compare Date values by their time so distinct instances for the same
+  // instant are equal, matching SQL TIMESTAMP semantics rather than JS identity.
+  if (a instanceof Date && b instanceof Date) {
+    const at = a.getTime()
+    const bt = b.getTime()
+    if (op === '!=' || op === '<>') return at !== bt
+    if (op === '=' || op === '==') return at === bt
+    if (op === '<') return at < bt
+    if (op === '<=') return at <= bt
+    if (op === '>') return at > bt
+    if (op === '>=') return at >= bt
+  }
   if (op === '!=' || op === '<>') return a != b
   if (op === '=' || op === '==') return a == b
   if (op === '<') return a < b

package/src/expression/evaluate.js

@@ -1,5 +1,5 @@
 import { executeStatement } from '../execute/execute.js'
-import { isPlainObject, keyify, stringify } from '../execute/utils.js'
+import { isPlainObject, keyify, sqlEquals, stringify } from '../execute/utils.js'
 import { ArgValueError, ExecutionError } from '../validation/executionErrors.js'
 import { isAggregateFunc, isMathFunc, isRegexpFunc, isSpatialFunc, isStringFunc } from '../validation/functions.js'
 import { UnknownFunctionError } from '../validation/parseErrors.js'
@@ -516,7 +516,7 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       return arr.length
     }
 
-    if (funcName === 'ARRAY_LENGTH' || funcName === 'CARDINALITY' || funcName === 'SIZE') {
+    if (funcName === 'ARRAY_LENGTH' || funcName === 'LIST_LENGTH' || funcName === 'LEN' || funcName === 'CARDINALITY' || funcName === 'SIZE') {
       const arr = args[0]
       if (!Array.isArray(arr)) return null
       if (funcName === 'ARRAY_LENGTH' && args.length === 2) {
@@ -539,19 +539,31 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       return arr.length
     }
 
-    if (funcName === 'ARRAY_POSITION') {
+    if (funcName === 'ARRAY_POSITION' || funcName === 'LIST_POSITION') {
       const [arr, target] = args
       if (!Array.isArray(arr)) return null
       const index = arr.indexOf(target)
       return index === -1 ? null : index + 1
     }
 
-    if (funcName === 'ARRAY_CONTAINS') {
+    if (funcName === 'ARRAY_CONTAINS' || funcName === 'LIST_CONTAINS') {
       const [arr, target] = args
       if (!Array.isArray(arr)) return null
       return arr.includes(target)
     }
 
+    if (funcName === 'ARRAY_APPEND' || funcName === 'LIST_APPEND') {
+      const [arr, element] = args
+      if (!Array.isArray(arr)) return null
+      return [...arr, element]
+    }
+
+    if (funcName === 'ARRAY_CONCAT' || funcName === 'LIST_CONCAT') {
+      const [a, b] = args
+      if (!Array.isArray(a) || !Array.isArray(b)) return null
+      return [...a, ...b]
+    }
+
     if (funcName === 'ARRAY_SORT') {
       const arr = args[0]
       if (!Array.isArray(arr)) return null
@@ -667,7 +679,7 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
     const exprVal = await evaluateExpr({ node: node.expr, row, rowIndex, rows, context })
     for (const valueNode of node.values) {
       const val = await evaluateExpr({ node: valueNode, row, rowIndex, rows, context })
-      if (exprVal == val) return true
+      if (sqlEquals(exprVal, val)) return true
     }
     return false
   }
@@ -677,7 +689,7 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
     const subResult = executeStatement({ query: node.subquery, context })
     for await (const resRow of subResult.rows()) {
       const value = await resRow.cells[resRow.columns[0]]()
-      if (exprVal == value) return true
+      if (sqlEquals(exprVal, value)) return true
     }
     return false
   }
@@ -703,7 +715,7 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
     for (const whenClause of node.whenClauses) {
       const whenValue = await evaluateExpr({ node: whenClause.condition, row, rowIndex, rows, context })
       // compare caseValue with condition or evaluate as boolean
-      if (caseValue !== undefined ? caseValue == whenValue : whenValue) {
+      if (caseValue !== undefined ? sqlEquals(caseValue, whenValue) : whenValue) {
         return evaluateExpr({ node: whenClause.result, row, rowIndex, rows, context })
       }
     }

package/src/validation/functions.js

@@ -184,9 +184,17 @@ export const FUNCTION_SIGNATURES = {
 
   // Array functions
   ARRAY_LENGTH: { min: 1, max: 2, signature: 'array[, dimension]' },
+  LIST_LENGTH: { min: 1, max: 1, signature: 'array' },
+  LEN: { min: 1, max: 1, signature: 'array' },
   ARRAY_POSITION: { min: 2, max: 2, signature: 'array, element' },
+  LIST_POSITION: { min: 2, max: 2, signature: 'array, element' },
   ARRAY_CONTAINS: { min: 2, max: 2, signature: 'array, element' },
+  LIST_CONTAINS: { min: 2, max: 2, signature: 'array, element' },
   ARRAY_SORT: { min: 1, max: 1, signature: 'array' },
+  ARRAY_APPEND: { min: 2, max: 2, signature: 'array, element' },
+  LIST_APPEND: { min: 2, max: 2, signature: 'array, element' },
+  ARRAY_CONCAT: { min: 2, max: 2, signature: 'array1, array2' },
+  LIST_CONCAT: { min: 2, max: 2, signature: 'array1, array2' },
   CARDINALITY: { min: 1, max: 1, signature: 'array' },
   SIZE: { min: 1, max: 1, signature: 'array' },