Fix tests

simolus3 · simolus3 · commit e600588c98a0 · 2025-08-27T11:14:54.000+02:00
diff --git a/packages/sync-rules/src/SqlDataQuery.ts b/packages/sync-rules/src/SqlDataQuery.ts
@@ -5,14 +5,13 @@ import { SqlRuleError } from './errors.js';
 import { ExpressionType } from './ExpressionType.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { SqlTools } from './sql_filters.js';
-import { castAsText } from './sql_functions.js';
 import { checkUnsupportedFeatures, isClauseError } from './sql_support.js';
 import { SyncRulesOptions } from './SqlSyncRules.js';
 import { TablePattern } from './TablePattern.js';
 import { TableQuerySchema } from './TableQuerySchema.js';
 import { EvaluationResult, ParameterMatchClause, QuerySchema, SqliteRow } from './types.js';
 import { getBucketId, isSelectStatement } from './utils.js';
-import { CompatibilityContext } from './quirks.js';
+import { CompatibilityContext } from './compatibility.js';
 
 export interface SqlDataQueryOptions extends BaseSqlDataQueryOptions {
   filter: ParameterMatchClause;
diff --git a/packages/sync-rules/src/SqlParameterQuery.ts b/packages/sync-rules/src/SqlParameterQuery.ts
@@ -29,7 +29,6 @@ import {
   SqliteRow
 } from './types.js';
 import { filterJsonRow, getBucketId, isJsonValue, isSelectStatement, normalizeParameterValue } from './utils.js';
-import { CompatibilityContext } from './quirks.js';
 
 export interface SqlParameterQueryOptions {
   sourceTable: TablePattern;
@@ -123,7 +122,7 @@ export class SqlParameterQuery {
       sql,
       supportsExpandingParameters: true,
       supportsParameterExpressions: true,
-      compatibilityContext: CompatibilityContext.ofFixedQuirks(options.fixedQuirks),
+      compatibilityContext: options.compatibility,
       schema: querySchema
     });
     tools.checkSpecificNameCase(tableRef);
diff --git a/packages/sync-rules/src/StaticSqlParameterQuery.ts b/packages/sync-rules/src/StaticSqlParameterQuery.ts
@@ -5,7 +5,6 @@ import { SqlTools } from './sql_filters.js';
 import { checkUnsupportedFeatures, isClauseError, isParameterValueClause, sqliteBool } from './sql_support.js';
 import { ParameterValueClause, QueryParseOptions, RequestParameters, SqliteJsonValue } from './types.js';
 import { getBucketId, isJsonValue } from './utils.js';
-import { CompatibilityContext } from './quirks.js';
 
 export interface StaticSqlParameterQueryOptions {
   sql: string;
@@ -40,7 +39,7 @@ export class StaticSqlParameterQuery {
       table: undefined,
       parameterTables: ['token_parameters', 'user_parameters'],
       supportsParameterExpressions: true,
-      compatibilityContext: CompatibilityContext.ofFixedQuirks(options.fixedQuirks),
+      compatibilityContext: options.compatibility,
       sql
     });
     const where = q.where;
diff --git a/packages/sync-rules/src/TableValuedFunctionSqlParameterQuery.ts b/packages/sync-rules/src/TableValuedFunctionSqlParameterQuery.ts
@@ -1,4 +1,4 @@
-import { FromCall, SelectedColumn, SelectFromStatement } from 'pgsql-ast-parser';
+import { FromCall, SelectFromStatement } from 'pgsql-ast-parser';
 import { SqlRuleError } from './errors.js';
 import { SqlTools } from './sql_filters.js';
 import { checkUnsupportedFeatures, isClauseError, isParameterValueClause, sqliteBool } from './sql_support.js';
@@ -13,7 +13,6 @@ import {
 } from './types.js';
 import { getBucketId, isJsonValue } from './utils.js';
 import { BucketDescription, BucketPriority, DEFAULT_BUCKET_PRIORITY } from './BucketDescription.js';
-import { CompatibilityContext } from './quirks.js';
 
 export interface TableValuedFunctionSqlParameterQueryOptions {
   sql: string;
@@ -49,7 +48,7 @@ export class TableValuedFunctionSqlParameterQuery {
     options: QueryParseOptions,
     queryId: string
   ): TableValuedFunctionSqlParameterQuery {
-    const compatibility = CompatibilityContext.ofFixedQuirks(options.fixedQuirks);
+    const compatibility = options.compatibility;
     let errors: SqlRuleError[] = [];
 
     errors.push(...checkUnsupportedFeatures(sql, q));
diff --git a/packages/sync-rules/src/TableValuedFunctions.ts b/packages/sync-rules/src/TableValuedFunctions.ts
@@ -1,4 +1,4 @@
-import { CompatibilityContext, Quirk } from './quirks.js';
+import { CompatibilityContext, CompatibilityOption } from './compatibility.js';
 import { SqliteJsonValue, SqliteRow, SqliteValue } from './types.js';
 import { jsonValueToSqlite } from './utils.js';
 
@@ -44,5 +44,5 @@ function jsonEachImplementation(fixedJsonBehavior: boolean): TableValuedFunction
 }
 
 export function generateTableValuedFunctions(compatibility: CompatibilityContext): Record<string, TableValuedFunction> {
-  return { json_each: jsonEachImplementation(compatibility.isFixed(Quirk.legacyJsonExtract)) };
+  return { json_each: jsonEachImplementation(compatibility.isEnabled(CompatibilityOption.fixedJsonExtract)) };
 }
diff --git a/packages/sync-rules/src/events/SqlEventSourceQuery.ts b/packages/sync-rules/src/events/SqlEventSourceQuery.ts
@@ -10,7 +10,7 @@ import { TablePattern } from '../TablePattern.js';
 import { TableQuerySchema } from '../TableQuerySchema.js';
 import { EvaluationError, QuerySchema, SqliteJsonRow, SqliteRow } from '../types.js';
 import { isSelectStatement } from '../utils.js';
-import { CompatibilityContext } from '../quirks.js';
+import { CompatibilityContext } from '../compatibility.js';
 
 export type EvaluatedEventSourceRow = {
   data: SqliteJsonRow;
diff --git a/packages/sync-rules/src/request_functions.ts b/packages/sync-rules/src/request_functions.ts
@@ -1,5 +1,5 @@
+import { CompatibilityContext, CompatibilityEdition } from './compatibility.js';
 import { ExpressionType } from './ExpressionType.js';
-import { CompatibilityContext, Quirk } from './quirks.js';
 import { generateSqlFunctions } from './sql_functions.js';
 import { ParameterValueSet, SqliteValue } from './types.js';
 
@@ -17,7 +17,7 @@ export interface SqlParameterFunction {
 }
 
 const jsonExtractFromRecord = generateSqlFunctions(
-  CompatibilityContext.ofFixedQuirks([Quirk.legacyJsonExtract])
+  new CompatibilityContext(CompatibilityEdition.SYNC_STREAMS)
 ).jsonExtractFromRecord;
 /**
  * Defines a `parameters` function and a `parameter` function.
diff --git a/packages/sync-rules/src/sql_filters.ts b/packages/sync-rules/src/sql_filters.ts
@@ -45,7 +45,7 @@ import {
   TrueIfParametersMatch
 } from './types.js';
 import { isJsonValue } from './utils.js';
-import { CompatibilityContext } from './quirks.js';
+import { CompatibilityContext } from './compatibility.js';
 
 export const MATCH_CONST_FALSE: TrueIfParametersMatch = [];
 export const MATCH_CONST_TRUE: TrueIfParametersMatch = [{}];
diff --git a/packages/sync-rules/src/sql_functions.ts b/packages/sync-rules/src/sql_functions.ts
@@ -9,7 +9,7 @@ import wkx from '@syncpoint/wkx';
 import { ExpressionType, SqliteType, SqliteValueType, TYPE_INTEGER } from './ExpressionType.js';
 import * as uuid from 'uuid';
 import { CustomSqliteValue } from './types/custom_sqlite_value.js';
-import { CompatibilityContext, Quirk } from './quirks.js';
+import { CompatibilityContext, CompatibilityOption } from './compatibility.js';
 
 export const BASIC_OPERATORS = new Set<string>([
   '=',
@@ -482,7 +482,7 @@ const st_y: DocumentedSqlFunction = {
 };
 
 export function generateSqlFunctions(compatibility: CompatibilityContext) {
-  const json = jsonFunctions(compatibility.isFixed(Quirk.legacyJsonExtract));
+  const json = jsonFunctions(compatibility.isEnabled(CompatibilityOption.fixedJsonExtract));
 
   const named = {
     upper,
diff --git a/packages/sync-rules/src/streams/from_sql.ts b/packages/sync-rules/src/streams/from_sql.ts
@@ -65,7 +65,7 @@ class SyncStreamCompiler {
     this.sql = sql;
     this.options = options;
     this.errors = [];
-    this.compatibility = new CompatibilityContext(CompatibilityLevel.SYNC_STREAMS, options.fixedQuirks);
+    this.compatibility = options.compatibility;
   }
 
   compile(): SyncStream {
diff --git a/packages/sync-rules/test/src/compatibility.test.ts b/packages/sync-rules/test/src/compatibility.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { CustomSqliteValue, SqlSyncRules, DateTimeValue, toSyncRulesValue } from '../../src/index.js';
+import { SqlSyncRules, DateTimeValue, toSyncRulesValue } from '../../src/index.js';
 
 import { ASSETS, PARSE_OPTIONS } from './util.js';
 
@@ -144,8 +144,8 @@ bucket_definitions:
   a:
     data:
       - SELECT id, description ->> 'foo.bar' AS "desc" FROM assets
-fixed_quirks:
-  - legacy_json_extract
+config:
+  fixed_json_extract: true
     `,
         PARSE_OPTIONS
       );
diff --git a/packages/sync-rules/test/src/sql_functions.test.ts b/packages/sync-rules/test/src/sql_functions.test.ts
@@ -1,4 +1,4 @@
-import { cast, CompatibilityContext, generateSqlFunctions, Quirk } from '../../src/index.js';
+import { cast, CompatibilityContext, CompatibilityEdition, generateSqlFunctions } from '../../src/index.js';
 import { describe, expect, test } from 'vitest';
 
 const compatibilityFunctions = generateSqlFunctions(CompatibilityContext.FULL_BACKWARDS_COMPATIBILITY);
@@ -56,9 +56,7 @@ describe('SQL functions', () => {
   });
 
   test('fixed json extract', () => {
-    const { jsonExtract, callable } = generateSqlFunctions(
-      CompatibilityContext.ofFixedQuirks([Quirk.legacyJsonExtract])
-    );
+    const { jsonExtract, callable } = generateSqlFunctions(new CompatibilityContext(CompatibilityEdition.SYNC_STREAMS));
 
     expect(callable.json_extract(`{"foo": null}`, '$.foo')).toBeNull();
     expect(jsonExtract(`{"foo": null}`, '$.foo', '->>')).toBeNull();
diff --git a/packages/sync-rules/test/src/table_valued_function_queries.test.ts b/packages/sync-rules/test/src/table_valued_function_queries.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { Quirk, RequestParameters, SqlParameterQuery } from '../../src/index.js';
+import { CompatibilityContext, CompatibilityEdition, RequestParameters, SqlParameterQuery } from '../../src/index.js';
 import { StaticSqlParameterQuery } from '../../src/StaticSqlParameterQuery.js';
 import { PARSE_OPTIONS } from './util.js';
 
@@ -34,7 +34,7 @@ describe('table-valued function queries', () => {
       {
         ...PARSE_OPTIONS,
         accept_potentially_dangerous_queries: true,
-        fixedQuirks: [Quirk.legacyJsonExtract]
+        compatibility: new CompatibilityContext(CompatibilityEdition.SYNC_STREAMS)
       },
       '1'
     ) as StaticSqlParameterQuery;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CompatibilityContext, Quirk } from './quirks.js';`
	`1`	`+import { CompatibilityContext, CompatibilityOption } from './compatibility.js';`
`2`	`2`	`import { SqliteJsonValue, SqliteRow, SqliteValue } from './types.js';`
`3`	`3`	`import { jsonValueToSqlite } from './utils.js';`
`4`	`4`
`@@ -44,5 +44,5 @@ function jsonEachImplementation(fixedJsonBehavior: boolean): TableValuedFunction`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`export function generateTableValuedFunctions(compatibility: CompatibilityContext): Record<string, TableValuedFunction> {`
`47`		`- return { json_each: jsonEachImplementation(compatibility.isFixed(Quirk.legacyJsonExtract)) };`
	`47`	`+ return { json_each: jsonEachImplementation(compatibility.isEnabled(CompatibilityOption.fixedJsonExtract)) };`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class SyncStreamCompiler {`
`65`	`65`	`this.sql = sql;`
`66`	`66`	`this.options = options;`
`67`	`67`	`this.errors = [];`
`68`		`- this.compatibility = new CompatibilityContext(CompatibilityLevel.SYNC_STREAMS, options.fixedQuirks);`
	`68`	`+ this.compatibility = options.compatibility;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`compile(): SyncStream {`