@sqb/oracle 4.21.1 → 4.23.0

package/helpers.d.ts

@@ -1,3 +1,3 @@
-import { ClientConfiguration } from '@sqb/connect';
-import { ConnectionAttributes } from 'oracledb';
+import type { ClientConfiguration } from '@sqb/connect';
+import type { ConnectionAttributes } from 'oracledb';
 export declare function clientConfigurationToDriver(config: ClientConfiguration): ConnectionAttributes;

package/helpers.js

@@ -1,9 +1,10 @@
+import { omit } from '@jsopen/objects';
 import url from 'url';
 export function clientConfigurationToDriver(config) {
     const cfg = {
         user: config.user,
         password: config.password,
-        ...config.driverOptions,
+        ...omit(config.driverOptions, ['dateParamFormat']),
     };
     if (config.host) {
         let hostUrl = config.host || 'localhost';

package/ora-adapter.d.ts

@@ -1,5 +1,12 @@
 import '@sqb/oracle-dialect';
-import { Adapter, ClientConfiguration } from '@sqb/connect';
+import type { Adapter, ClientConfiguration } from '@sqb/connect';
+export interface OraClientConfiguration extends ClientConfiguration {
+    driverOptions?: {
+        direct?: boolean;
+        /** Format from date-fns. https://date-fns.org/ */
+        dateParamFormat?: string;
+    };
+}
 export declare class OraAdapter implements Adapter {
     driver: string;
     dialect: string;
@@ -7,5 +14,5 @@ export declare class OraAdapter implements Adapter {
         cursor: boolean;
         schema: boolean;
     };
-    connect(config: ClientConfiguration): Promise<Adapter.Connection>;
+    connect(config: OraClientConfiguration): Promise<Adapter.Connection>;
 }

package/ora-connection.d.ts

@@ -1,4 +1,4 @@
-import { Adapter, QueryRequest } from '@sqb/connect';
+import type { Adapter, QueryRequest } from '@sqb/connect';
 import oracledb from 'oracledb';
 export declare const dataTypeNames: {
     DB_TYPE_BFILE: string;
@@ -27,12 +27,16 @@ export declare const dataTypeNames: {
     DB_TYPE_TIMESTAMP_TZ: string;
     DB_TYPE_VARCHAR: string;
 };
+export interface OraConnectionOptions {
+    dateParamFormat?: string;
+}
 export declare class OraConnection implements Adapter.Connection {
     sessionId: string;
     private intlcon?;
     serverVersion: string;
     private _inTransaction;
-    constructor(conn: oracledb.Connection, sessionId: string);
+    dateParamFormat?: string;
+    constructor(conn: oracledb.Connection, sessionId: string, options?: OraConnectionOptions);
     close(): Promise<void>;
     reset(): Promise<void>;
     startTransaction(): Promise<void>;

package/ora-connection.js

@@ -1,4 +1,5 @@
 import assert from 'assert';
+import * as dateFns from 'date-fns';
 import oracledb from 'oracledb';
 import { OraCursor } from './ora-cursor.js';
 export const dataTypeNames = {
@@ -60,10 +61,12 @@ export class OraConnection {
     intlcon;
     serverVersion;
     _inTransaction = false;
-    constructor(conn, sessionId) {
+    dateParamFormat;
+    constructor(conn, sessionId, options = {}) {
         this.sessionId = sessionId;
         this.intlcon = conn;
         this.serverVersion = '' + conn.oracleServerVersion;
+        this.dateParamFormat = options.dateParamFormat;
     }
     async close() {
         if (!this.intlcon)
@@ -124,6 +127,27 @@ export class OraConnection {
         else
             oraOptions.maxRows = request.fetchRows;
         const out = {};
+        const params = request.params;
+        if (this.dateParamFormat) {
+            const wrapDate = (v) => {
+                if (v instanceof Date)
+                    return dateFns.format(v, this.dateParamFormat);
+                if (v.value instanceof Date)
+                    v.value = dateFns.format(v.value, this.dateParamFormat);
+                return v;
+            };
+            if (params && typeof params === 'object') {
+                if (Array.isArray(params)) {
+                    params.forEach((v, i) => {
+                        params[i] = wrapDate(v);
+                    });
+                }
+                else
+                    Object.keys(params).forEach(k => {
+                        params[k] = wrapDate(params[k]);
+                    });
+            }
+        }
         this.intlcon.action = request.action || '';
         let response = await this.intlcon.execute(request.sql, request.params || [], oraOptions);
         if (response.rowsAffected)

package/ora-cursor.d.ts

@@ -1,4 +1,4 @@
-import { Adapter, RowType } from '@sqb/connect';
+import type { Adapter, RowType } from '@sqb/connect';
 import { ResultSet } from 'oracledb';
 export declare class OraCursor implements Adapter.Cursor {
     private _resultSet?;

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@sqb/oracle",
   "description": "SQB serialization extension for Oracle database",
-  "version": "4.21.1",
+  "version": "4.23.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
+    "date-fns": "^4.1.0",
+    "@jsopen/objects": "^2.2.0",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.21.1",
-    "@sqb/connect": "^4.21.1",
-    "@sqb/oracle-dialect": "^4.21.1",
+    "@sqb/builder": "^4.23.0",
+    "@sqb/connect": "^4.23.0",
+    "@sqb/oracle-dialect": "^4.23.0",
     "oracledb": ">= 6.4.0"
   },
   "type": "module",