squirreling 0.15.1 → 0.15.2

package/README.md

@@ -146,7 +146,7 @@ Squirreling mostly follows the SQL standard. The following features are supporte
 - `JOIN` operations: `INNER JOIN`, `LEFT JOIN`, `RIGHT JOIN`, `FULL JOIN`, `CROSS JOIN`, `POSITIONAL JOIN`, `LATERAL VIEW [OUTER] EXPLODE(...)`, with `ON` or `USING (col, ...)` conditions
 - `GROUP BY` and `HAVING` clauses
 - Set operations: `UNION`, `UNION ALL`, `INTERSECT`, `INTERSECT ALL`, `EXCEPT`, `EXCEPT ALL`
-- Expressions: `CASE`, `CAST`, `BETWEEN`, `IN`, `LIKE`, `IS NULL`, `IS NOT NULL`, string concatenation `||`
+- Expressions: `CASE`, `CAST`, `TRY_CAST`, `BETWEEN`, `IN`, `LIKE`, `IS NULL`, `IS NOT NULL`, string concatenation `||`
 - Subscript access: zero-based array indexing `col[0]`, struct field access `col['field']`, and chains like `col[0].field`
 
 ### Quoting
@@ -157,16 +157,16 @@ Squirreling mostly follows the SQL standard. The following features are supporte
 
 ### Functions
 
-- Aggregate: `COUNT`, `COUNTIF`, `SUM`, `AVG`, `MIN`, `MAX`, `MEDIAN`, `PERCENTILE_CONT`, `APPROX_QUANTILE`, `STDDEV_POP`, `STDDEV_SAMP`, `ARRAY_AGG`, `JSON_ARRAYAGG`, `STRING_AGG`
+- Aggregate: `COUNT`, `COUNTIF`, `SUM`, `AVG`, `MIN`, `MAX`, `MIN_BY`, `MAX_BY`, `ANY_VALUE`, `MEDIAN`, `PERCENTILE_CONT`, `APPROX_QUANTILE`, `STDDEV_POP`, `STDDEV_SAMP`, `ARRAY_AGG`, `JSON_ARRAYAGG`, `STRING_AGG`
 - Window: `ROW_NUMBER`, `LAG`, `LEAD`
 - String: `CONCAT`, `SUBSTRING`, `REPLACE`, `LENGTH`, `OCTET_LENGTH`, `UPPER`, `LOWER`, `TRIM`, `LEFT`, `RIGHT`, `INSTR`, `POSITION`, `STRPOS`, `SPLIT_PART`, `STRING_SPLIT`
 - Math: `ABS`, `SIGN`, `CEIL`, `FLOOR`, `ROUND`, `MOD`, `RAND`, `RANDOM`, `LN`, `LOG10`, `EXP`, `POWER`, `SQRT`
 - 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`, `JSON_KEYS`
+- Json: `JSON_VALUE`, `JSON_QUERY`, `JSON_EXTRACT`, `JSON_EXTRACT_STRING`, `JSON_OBJECT`, `JSON_ARRAY_LENGTH`, `JSON_VALID`, `JSON_TYPE`, `JSON_KEYS`
 - 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`
+- Regex: `REGEXP_SUBSTR`, `REGEXP_EXTRACT`, `REGEXP_REPLACE`, `REGEXP_MATCHES`, `REGEXP_LIKE`
 - 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`
 - Conditional: `COALESCE`, `NULLIF`, `GREATEST`, `LEAST`
 - User-defined functions (UDFs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squirreling",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Squirreling Async SQL Engine",
   "author": "Hyperparam",
   "homepage": "https://hyperparam.app",

package/src/ast.d.ts

@@ -120,6 +120,8 @@ export interface CastNode extends AstBase {
   type: 'cast'
   expr: ExprNode
   toType: CastType
+  /** TRY_CAST returns null instead of throwing when the value cannot be cast */
+  tryCast?: boolean
 }
 
 export interface InSubqueryNode extends AstBase {

package/src/expression/evaluate.js

@@ -289,6 +289,37 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
         if (funcName === 'MAX') return max
       }
 
+      if (funcName === 'MIN_BY' || funcName === 'ARG_MIN' || funcName === 'MAX_BY' || funcName === 'ARG_MAX') {
+        // Returns the value at the row with the smallest (or largest) key.
+        // Rows with a null value or key are ignored, and ties keep the first row.
+        const isMin = funcName === 'MIN_BY' || funcName === 'ARG_MIN'
+        const values = await evaluateAll(argNode, filteredRows, context)
+        const keys = await evaluateAll(node.args[1], filteredRows, context)
+        /** @type {SqlPrimitive} */
+        let best = null
+        /** @type {SqlPrimitive} */
+        let bestKey = null
+        for (let i = 0; i < values.length; i++) {
+          const value = values[i]
+          const key = keys[i]
+          if (value == null || key == null) continue
+          if (bestKey === null || (isMin ? key < bestKey : key > bestKey)) {
+            best = value
+            bestKey = key
+          }
+        }
+        return best
+      }
+
+      if (funcName === 'ANY_VALUE') {
+        // Returns an arbitrary non-null value from the group; we pick the first
+        const values = await evaluateAll(argNode, filteredRows, context)
+        for (const v of values) {
+          if (v != null) return v
+        }
+        return null
+      }
+
       if (funcName === 'STDDEV_SAMP' || funcName === 'STDDEV_POP') {
         const rawValues = await evaluateAll(argNode, filteredRows, context)
         let sum = 0
@@ -633,7 +664,7 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       })
     }
 
-    if (funcName === 'JSON_VALUE' || funcName === 'JSON_QUERY' || funcName === 'JSON_EXTRACT') {
+    if (funcName === 'JSON_VALUE' || funcName === 'JSON_QUERY' || funcName === 'JSON_EXTRACT' || funcName === 'JSON_EXTRACT_STRING') {
       let jsonArg = args[0]
       const pathArg = args[1]
       if (jsonArg == null || pathArg == null) return null
@@ -682,6 +713,11 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
       }
 
       if (current == null) return null
+      // JSON_EXTRACT_STRING returns text: unquoted scalars, JSON text for objects and arrays
+      if (funcName === 'JSON_EXTRACT_STRING') {
+        if (typeof current === 'object') return JSON.stringify(current)
+        return String(current)
+      }
       return current
     }
 
@@ -707,6 +743,7 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
     }
     // Can only cast primitives (and Dates) to other primitive types
     if (typeof val === 'object' && !(val instanceof Date)) {
+      if (node.tryCast) return null
       throw new ExecutionError({ message: `Cannot CAST object to ${toType}`, rowIndex, ...node })
     }
     if (toType === 'INTEGER' || toType === 'INT') {
@@ -717,7 +754,8 @@ export async function evaluateExpr({ node, row, rowIndex, rows, context }) {
     if (toType === 'BIGINT') {
       if (typeof val === 'bigint') return val
       const num = Number(val)
-      if (isNaN(num)) return null
+      // NaN and Infinity have no bigint representation
+      if (!isFinite(num)) return null
       return BigInt(Math.trunc(num))
     }
     if (toType === 'FLOAT' || toType === 'REAL' || toType === 'DOUBLE') {

package/src/expression/regexp.js

@@ -78,7 +78,7 @@ export function evaluateRegexpFunc({ funcName, node, args, rowIndex }) {
     return null
   }
 
-  if (funcName === 'REGEXP_MATCHES') {
+  if (funcName === 'REGEXP_MATCHES' || funcName === 'REGEXP_LIKE') {
     const str = args[0]
     const pattern = args[1]
     if (str == null || pattern == null) return null

package/src/parse/primary.js

@@ -125,8 +125,8 @@ function parsePrimaryBase(state) {
     const next = peekToken(state, 1)
     const funcNameUpper = tok.value.toUpperCase()
 
-    // CAST(expr AS type)
-    if (funcNameUpper === 'CAST' && next.type === 'paren' && next.value === '(') {
+    // CAST(expr AS type) and TRY_CAST(expr AS type)
+    if ((funcNameUpper === 'CAST' || funcNameUpper === 'TRY_CAST') && next.type === 'paren' && next.value === '(') {
       consume(state) // CAST
       consume(state) // '('
       const expr = parseExpression(state)
@@ -145,6 +145,7 @@ function parsePrimaryBase(state) {
         type: 'cast',
         expr,
         toType,
+        tryCast: funcNameUpper === 'TRY_CAST' ? true : undefined,
         positionStart,
         positionEnd: state.lastPos,
       }

package/src/types.d.ts

@@ -137,9 +137,9 @@ export interface UserDefinedFunction {
   arguments: FunctionSignature
 }
 
-export type AggregateFunc = 'COUNT' | 'COUNTIF' | 'SUM' | 'AVG' | 'MIN' | 'MAX' | 'ARRAY_AGG' | 'LIST' | 'JSON_ARRAYAGG' | 'STDDEV_SAMP' | 'STDDEV_POP' | 'MEDIAN' | 'PERCENTILE_CONT' | 'APPROX_QUANTILE' | 'STRING_AGG'
+export type AggregateFunc = 'COUNT' | 'COUNTIF' | 'SUM' | 'AVG' | 'MIN' | 'MAX' | 'MIN_BY' | 'ARG_MIN' | 'MAX_BY' | 'ARG_MAX' | 'ANY_VALUE' | 'ARRAY_AGG' | 'LIST' | 'JSON_ARRAYAGG' | 'STDDEV_SAMP' | 'STDDEV_POP' | 'MEDIAN' | 'PERCENTILE_CONT' | 'APPROX_QUANTILE' | 'STRING_AGG'
 
-export type RegExpFunction = 'REGEXP_SUBSTR' | 'REGEXP_EXTRACT' | 'REGEXP_REPLACE' | 'REGEXP_MATCHES'
+export type RegExpFunction = 'REGEXP_SUBSTR' | 'REGEXP_EXTRACT' | 'REGEXP_REPLACE' | 'REGEXP_MATCHES' | 'REGEXP_LIKE'
 
 export type MathFunc =
   | 'FLOOR'

package/src/validation/functions.js

@@ -11,7 +11,7 @@ export const niladicFuncs = ['CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP'
  * @returns {name is AggregateFunc}
  */
 export function isAggregateFunc(name) {
-  return ['COUNT', 'COUNTIF', 'SUM', 'AVG', 'MIN', 'MAX', 'ARRAY_AGG', 'LIST', 'JSON_ARRAYAGG', 'STDDEV_SAMP', 'STDDEV_POP', 'MEDIAN', 'PERCENTILE_CONT', 'APPROX_QUANTILE', 'STRING_AGG'].includes(name)
+  return ['COUNT', 'COUNTIF', 'SUM', 'AVG', 'MIN', 'MAX', 'MIN_BY', 'ARG_MIN', 'MAX_BY', 'ARG_MAX', 'ANY_VALUE', 'ARRAY_AGG', 'LIST', 'JSON_ARRAYAGG', 'STDDEV_SAMP', 'STDDEV_POP', 'MEDIAN', 'PERCENTILE_CONT', 'APPROX_QUANTILE', 'STRING_AGG'].includes(name)
 }
 
 /**
@@ -39,7 +39,7 @@ export function isWindowFunc(name) {
  * @returns {name is RegExpFunction}
  */
 export function isRegexpFunc(name) {
-  return ['REGEXP_SUBSTR', 'REGEXP_EXTRACT', 'REGEXP_REPLACE', 'REGEXP_MATCHES'].includes(name)
+  return ['REGEXP_SUBSTR', 'REGEXP_EXTRACT', 'REGEXP_REPLACE', 'REGEXP_MATCHES', 'REGEXP_LIKE'].includes(name)
 }
 
 /**
@@ -134,6 +134,7 @@ export const FUNCTION_SIGNATURES = {
   REGEXP_EXTRACT: { min: 2, max: 4, signature: 'string, pattern[, position[, occurrence]]' },
   REGEXP_REPLACE: { min: 3, max: 5, signature: 'string, pattern, replacement[, position[, occurrence]]' },
   REGEXP_MATCHES: { min: 2, max: 2, signature: 'string, pattern' },
+  REGEXP_LIKE: { min: 2, max: 2, signature: 'string, pattern' },
 
   // Date/time functions
   RANDOM: { min: 0, max: 0, signature: '' },
@@ -178,6 +179,7 @@ export const FUNCTION_SIGNATURES = {
   JSON_VALUE: { min: 2, max: 2, signature: 'expression, path' },
   JSON_QUERY: { min: 2, max: 2, signature: 'expression, path' },
   JSON_EXTRACT: { min: 2, max: 2, signature: 'expression, path' },
+  JSON_EXTRACT_STRING: { min: 2, max: 2, signature: 'expression, path' },
   JSON_OBJECT: { min: 0, signature: 'key1, value1[, ...]' },
   JSON_ARRAY_LENGTH: { min: 1, max: 1, signature: 'array' },
   JSON_VALID: { min: 1, max: 1, signature: 'value' },
@@ -221,6 +223,11 @@ export const FUNCTION_SIGNATURES = {
   AVG: { min: 1, max: 1, signature: 'expression' },
   MIN: { min: 1, max: 1, signature: 'expression' },
   MAX: { min: 1, max: 1, signature: 'expression' },
+  MIN_BY: { min: 2, max: 2, signature: 'value, key' },
+  ARG_MIN: { min: 2, max: 2, signature: 'value, key' },
+  MAX_BY: { min: 2, max: 2, signature: 'value, key' },
+  ARG_MAX: { min: 2, max: 2, signature: 'value, key' },
+  ANY_VALUE: { min: 1, max: 1, signature: 'expression' },
   STDDEV_SAMP: { min: 1, max: 1, signature: 'expression' },
   STDDEV_POP: { min: 1, max: 1, signature: 'expression' },
   MEDIAN: { min: 1, max: 1, signature: 'expression' },