@carbonorm/carbonnode 6.1.0 → 6.1.1

package/dist/orm/utils/sqlUtils.d.ts

@@ -5,3 +5,4 @@ export interface SqlBuilderResult {
     };
 }
 export declare function convertHexIfBinary(_col: string, val: any, columnDef?: any): any;
+export declare function convertSqlValueForColumn(col: string, val: any, columnDef?: any): any;

package/dist/types/ormInterfaces.d.ts

@@ -196,6 +196,7 @@ export interface iRest<RestShortTableName extends string = any, RestTableInterfa
     logLevel?: number;
     verbose?: boolean;
     sqlAllowListPath?: string;
+    sqlQueryNormalizer?: (sql: string) => string;
 }
 export interface iConstraint {
     TABLE: string;

package/dist/utils/sqlAllowList.d.ts

@@ -1,5 +1,7 @@
+export type SqlQueryNormalizer = (sql: string) => string;
 export declare const normalizeSql: (sql: string) => string;
-export declare const loadSqlAllowList: (allowListPath: string) => Promise<Set<string>>;
+export declare const normalizeSqlWith: (sql: string, sqlQueryNormalizer?: SqlQueryNormalizer) => string;
+export declare const loadSqlAllowList: (allowListPath: string, sqlQueryNormalizer?: SqlQueryNormalizer) => Promise<Set<string>>;
 export declare const extractSqlEntries: (payload: unknown) => string[];
-export declare const collectSqlAllowListEntries: (payload: unknown, entries?: Set<string>) => Set<string>;
-export declare const compileSqlAllowList: (allowListPath: string, entries: Iterable<string>) => Promise<string[]>;
+export declare const collectSqlAllowListEntries: (payload: unknown, entries?: Set<string>, sqlQueryNormalizer?: SqlQueryNormalizer) => Set<string>;
+export declare const compileSqlAllowList: (allowListPath: string, entries: Iterable<string>, sqlQueryNormalizer?: SqlQueryNormalizer) => Promise<string[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonnode",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "browser": "dist/index.umd.js",
   "repository": {
     "type": "git",

package/src/__tests__/fixtures/c6.fixture.ts

@@ -136,6 +136,39 @@ export function buildBinaryTestConfigFqn() {
   return baseConfig;
 }
 
+export function buildTemporalTestConfig() {
+  const temporalCols = {
+    'events.id': 'id',
+    'events.read_at': 'read_at',
+    'events.read_on': 'read_on',
+    'events.read_time': 'read_time',
+  } as const;
+
+  const C6 = {
+    C6VERSION: 'test',
+    TABLES: {
+      events: tableModel<'events' & any>('events', temporalCols as any),
+    },
+    PREFIX: '',
+    ORM: {} as any,
+  } as any;
+
+  C6.TABLES.events.TYPE_VALIDATION['id'].MYSQL_TYPE = 'INT';
+  C6.TABLES.events.TYPE_VALIDATION['read_at'].MYSQL_TYPE = 'TIMESTAMP(3)';
+  C6.TABLES.events.TYPE_VALIDATION['read_on'].MYSQL_TYPE = 'DATE';
+  C6.TABLES.events.TYPE_VALIDATION['read_time'].MYSQL_TYPE = 'TIME(3)';
+
+  const baseConfig: iRest<any, any, any> = {
+    C6,
+    restModel: C6.TABLES.events,
+    requestMethod: 'POST',
+    verbose: false,
+    logLevel: LogLevel.DEBUG,
+  } as any;
+
+  return baseConfig;
+}
+
 export function buildParcelConfig() {
   const propertyUnitsCols = {
     'property_units.unit_id': 'unit_id',

package/src/__tests__/sakila-db/C6.js

@@ -1342,7 +1342,7 @@ export const TABLES = {
 };
 export const C6 = {
     ...C6Constants,
-    C6VERSION: '6.1.0',
+    C6VERSION: '6.1.1',
     IMPORT: async (tableName) => {
         tableName = tableName.toLowerCase();
         // if tableName is not a key in the TABLES object then throw an error