@sqb/oracle-dialect 4.1.5 → 4.5.0

package/README.md

@@ -0,0 +1,67 @@
+
+<p style="text-align:center">
+  <img src="https://user-images.githubusercontent.com/3836517/32965280-1a2b63ce-cbe7-11e7-8ee1-ba47313503c5.png" width="500px" alt="SQB Logo"/>
+</p>
+
+<br>
+  
+[![NPM Version][npm-image]][npm-url]
+[![NPM Downloads][downloads-image]][downloads-url]
+[![Build Status][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+[![Dependencies][dependencies-image]][dependencies-url]
+[![DevDependencies][devdependencies-image]][devdependencies-url]
+[![Package Quality][quality-image]][quality-url]
+
+
+## About SQB
+
+SQB is an extensible, multi-dialect SQL query builder and Database connection wrapper for NodeJS.
+
+## Main goals
+
+- Single code base for any sql based database
+- Powerful and simplified query coding scheme
+- Fast applications with low memory requirements
+- Let applications work with large data tables efficiently
+- Support latest JavaScript language standards
+- Lightweight and extensible framework. 
+
+
+You can report bugs and discuss features on the [GitHub issues](https://github.com/sqbjs/sqb/issues) page
+
+Thanks to all of the great [contributions](https://github.com/sqbjs/sqb/graphs/contributors) to the project.
+
+You may want to check detailed [DOCUMENTATION](https://sqbjs.github.io/sqb/)
+
+
+## Installation
+
+```bash
+$ npm install @sqb/oracle-dialect --save
+```
+
+## Node Compatibility
+
+  - node >= 16.x
+  
+   
+### License
+SQB is available under [MIT](LICENSE) license.
+
+[npm-image]: https://img.shields.io/npm/v/@sqb/oracle-dialect.svg
+[npm-url]: https://npmjs.org/package/@sqb/oracle-dialect
+[travis-image]: https://img.shields.io/travis/sqbjs/@sqb/oracle-dialect/master.svg
+[travis-url]: https://travis-ci.org/sqbjs/@sqb/oracle-dialect
+[coveralls-image]: https://img.shields.io/coveralls/sqbjs/@sqb/oracle-dialect/master.svg
+[coveralls-url]: https://coveralls.io/r/sqbjs/@sqb/oracle-dialect
+[downloads-image]: https://img.shields.io/npm/dm/@sqb/oracle-dialect.svg
+[downloads-url]: https://npmjs.org/package/@sqb/oracle-dialect
+[gitter-image]: https://badges.gitter.im/sqbjs/@sqb/oracle-dialect.svg
+[gitter-url]: https://gitter.im/sqbjs/@sqb/oracle-dialect?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[dependencies-image]: https://david-dm.org/sqbjs/@sqb/oracle-dialect/status.svg
+[dependencies-url]:https://david-dm.org/sqbjs/@sqb/oracle-dialect
+[devdependencies-image]: https://david-dm.org/sqbjs/@sqb/oracle-dialect/dev-status.svg
+[devdependencies-url]:https://david-dm.org/sqbjs/@sqb/oracle-dialect?type=dev
+[quality-image]: http://npm.packagequality.com/shield/@sqb/oracle-dialect.png
+[quality-url]: http://packagequality.com/#?package=@sqb/oracle-dialect

package/cjs/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const builder_1 = require("@sqb/builder");
+const oracle_serializer_js_1 = require("./oracle-serializer.js");
+(0, builder_1.registerSerializer)(new oracle_serializer_js_1.OracleSerializer());

package/{dist/OracleSerializer.js → cjs/oracle-serializer.js}

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OracleSerializer = void 0;
-const tslib_1 = require("tslib");
-const compareVersion = tslib_1.__importStar(require("compare-versions"));
 const builder_1 = require("@sqb/builder");
 const reservedWords = ['comment', 'dual'];
 class OracleSerializer {
-    constructor() {
-        this.dialect = 'oracle';
-    }
+    dialect = 'oracle';
     isReservedWord(ctx, s) {
         return s && typeof s === 'string' &&
             reservedWords.includes(s.toLowerCase());
@@ -29,6 +25,10 @@ class OracleSerializer {
                 return this._serializeBooleanValue(ctx, o);
             case builder_1.SerializationType.RETURNING_BLOCK:
                 return this._serializeReturning();
+            case builder_1.SerializationType.STRINGAGG_STATEMENT:
+                return this._serializeStringAGG(ctx, o, defFn);
+            case builder_1.SerializationType.SEQUENCE_GETTER_STATEMENT:
+                return this._serializeSequenceGetter(ctx, o, defFn);
         }
     }
     _serializeSelect(ctx, o, defFn) {
@@ -36,7 +36,7 @@ class OracleSerializer {
         const limit = o.limit || 0;
         const offset = Math.max((o.offset || 0), 0);
         if (limit || offset) {
-            if (ctx.dialectVersion && compareVersion.compare(ctx.dialectVersion, '12', '>=')) {
+            if (ctx.dialectVersion && ctx.dialectVersion >= '12') {
                 if (offset)
                     out += '\nOFFSET ' + offset + ' ROWS' +
                         (limit ? ' FETCH NEXT ' + limit + ' ROWS ONLY' : '');
@@ -67,13 +67,22 @@ class OracleSerializer {
         return defFn(ctx, o) || 'from dual';
     }
     _serializeComparison(ctx, o, defFn) {
-        if (o.right) {
-            if (o.right.expression.toLowerCase() === 'null') {
-                if (o.operatorType === 'eq')
-                    return defFn(ctx, { ...o, operatorType: builder_1.OperatorType.is, symbol: 'is' });
-                if (o.operatorType === 'ne')
-                    return defFn(ctx, { ...o, operatorType: builder_1.OperatorType.isNot, symbol: 'is not' });
+        if ((o.right.expression && o.right.expression === 'null') ||
+            ((!o.right.expression || o.right.expression.startsWith(':')) && o.right.value == null)) {
+            if (o.right.expression?.startsWith(':')) {
+                if (ctx.params)
+                    delete ctx.params[o.right.expression.substring(1)];
+                if (ctx.preparedParams)
+                    delete ctx.preparedParams[o.right.expression.substring(1)];
+                if (ctx.paramOptions)
+                    delete ctx.paramOptions[o.right.expression.substring(1)];
+                o.right.expression = 'null';
+                o.right.isParam = false;
             }
+            if (o.operatorType === 'eq')
+                return defFn(ctx, { ...o, operatorType: builder_1.OperatorType.is, symbol: 'is' });
+            if (o.operatorType === 'ne')
+                return defFn(ctx, { ...o, operatorType: builder_1.OperatorType.isNot, symbol: 'is not' });
         }
         return defFn(ctx, o);
     }
@@ -95,6 +104,23 @@ class OracleSerializer {
     _serializeBooleanValue(_ctx, o) {
         return o == null ? 'null' : (o ? '1' : '0');
     }
+    // noinspection JSUnusedLocalSymbols
+    _serializeStringAGG(ctx, o, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    defFn) {
+        return 'listagg(' + o.field +
+            ',\'' + o.delimiter + '\') within group (' +
+            (o.orderBy ? o.orderBy : 'order by null') + ')' +
+            (o.alias ? ' ' + o.alias : '');
+    }
+    // noinspection JSUnusedLocalSymbols
+    _serializeSequenceGetter(ctx, o, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    defFn) {
+        return o.genName + '.' +
+            (o.next ? 'nextval' : 'currval') +
+            (o.alias ? ' ' + o.alias : '');
+    }
     _serializeReturning() {
         return '';
     }

package/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/esm/index.js

@@ -0,0 +1,3 @@
+import { registerSerializer } from '@sqb/builder';
+import { OracleSerializer } from './oracle-serializer.js';
+registerSerializer(new OracleSerializer());

package/{dist/OracleSerializer.d.ts → esm/oracle-serializer.d.ts}

@@ -9,5 +9,7 @@ export declare class OracleSerializer implements SerializerExtension {
     private _serializeStringValue;
     private _serializeDateValue;
     private _serializeBooleanValue;
+    private _serializeStringAGG;
+    private _serializeSequenceGetter;
     private _serializeReturning;
 }

package/esm/oracle-serializer.js

@@ -0,0 +1,124 @@
+import { OperatorType, SerializationType } from '@sqb/builder';
+const reservedWords = ['comment', 'dual'];
+export class OracleSerializer {
+    dialect = 'oracle';
+    isReservedWord(ctx, s) {
+        return s && typeof s === 'string' &&
+            reservedWords.includes(s.toLowerCase());
+    }
+    serialize(ctx, type, o, defFn) {
+        switch (type) {
+            case SerializationType.SELECT_QUERY:
+                return this._serializeSelect(ctx, o, defFn);
+            case SerializationType.SELECT_QUERY_FROM:
+                return this._serializeFrom(ctx, o, defFn);
+            case SerializationType.COMPARISON_EXPRESSION:
+                return this._serializeComparison(ctx, o, defFn);
+            case SerializationType.STRING_VALUE:
+                return this._serializeStringValue(ctx, o, defFn);
+            case SerializationType.DATE_VALUE:
+                return this._serializeDateValue(ctx, o, defFn);
+            case SerializationType.BOOLEAN_VALUE:
+                return this._serializeBooleanValue(ctx, o);
+            case SerializationType.RETURNING_BLOCK:
+                return this._serializeReturning();
+            case SerializationType.STRINGAGG_STATEMENT:
+                return this._serializeStringAGG(ctx, o, defFn);
+            case SerializationType.SEQUENCE_GETTER_STATEMENT:
+                return this._serializeSequenceGetter(ctx, o, defFn);
+        }
+    }
+    _serializeSelect(ctx, o, defFn) {
+        let out = defFn(ctx, o);
+        const limit = o.limit || 0;
+        const offset = Math.max((o.offset || 0), 0);
+        if (limit || offset) {
+            if (ctx.dialectVersion && ctx.dialectVersion >= '12') {
+                if (offset)
+                    out += '\nOFFSET ' + offset + ' ROWS' +
+                        (limit ? ' FETCH NEXT ' + limit + ' ROWS ONLY' : '');
+                else
+                    out += '\nFETCH FIRST ' + limit + ' ROWS ONLY';
+            }
+            else {
+                if (offset || o.orderBy) {
+                    out = 'select * from (\n\t' +
+                        'select /*+ first_rows(' + (limit || 100) +
+                        ') */ t.*, rownum row$number from (\n\t' +
+                        out + '\n\b' +
+                        ') t' +
+                        (limit ? ' where rownum <= ' + (limit + offset) : '') + '\n\b)';
+                    if (offset)
+                        out += ' where row$number >= ' + (offset + 1);
+                }
+                else {
+                    out = 'select * from (\n\t' +
+                        out + '\n\b' +
+                        ') where rownum <= ' + limit;
+                }
+            }
+        }
+        return out;
+    }
+    _serializeFrom(ctx, o, defFn) {
+        return defFn(ctx, o) || 'from dual';
+    }
+    _serializeComparison(ctx, o, defFn) {
+        if ((o.right.expression && o.right.expression === 'null') ||
+            ((!o.right.expression || o.right.expression.startsWith(':')) && o.right.value == null)) {
+            if (o.right.expression?.startsWith(':')) {
+                if (ctx.params)
+                    delete ctx.params[o.right.expression.substring(1)];
+                if (ctx.preparedParams)
+                    delete ctx.preparedParams[o.right.expression.substring(1)];
+                if (ctx.paramOptions)
+                    delete ctx.paramOptions[o.right.expression.substring(1)];
+                o.right.expression = 'null';
+                o.right.isParam = false;
+            }
+            if (o.operatorType === 'eq')
+                return defFn(ctx, { ...o, operatorType: OperatorType.is, symbol: 'is' });
+            if (o.operatorType === 'ne')
+                return defFn(ctx, { ...o, operatorType: OperatorType.isNot, symbol: 'is not' });
+        }
+        return defFn(ctx, o);
+    }
+    _serializeStringValue(ctx, o, defFn) {
+        if (typeof o === 'string') {
+            if (o.match(/^\d{4}-\d{2}-\d{2}$/))
+                return 'to_date(' + o + ', \'yyyy-mm-dd\')';
+            if (o.match(/^\d{4}-\d{2}-\d{2}T/))
+                return `to_timestamp_tz('${o}','yyyy-mm-dd"T"hh24:mi:sstzh:tzm')`;
+        }
+        return defFn(ctx, o);
+    }
+    _serializeDateValue(ctx, o, defFn) {
+        const s = defFn(ctx, o);
+        return s && (s.length <= 12 ?
+            'to_date(' + s + ', \'yyyy-mm-dd\')' :
+            'to_date(' + s + ', \'yyyy-mm-dd hh24:mi:ss\')');
+    }
+    _serializeBooleanValue(_ctx, o) {
+        return o == null ? 'null' : (o ? '1' : '0');
+    }
+    // noinspection JSUnusedLocalSymbols
+    _serializeStringAGG(ctx, o, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    defFn) {
+        return 'listagg(' + o.field +
+            ',\'' + o.delimiter + '\') within group (' +
+            (o.orderBy ? o.orderBy : 'order by null') + ')' +
+            (o.alias ? ' ' + o.alias : '');
+    }
+    // noinspection JSUnusedLocalSymbols
+    _serializeSequenceGetter(ctx, o, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    defFn) {
+        return o.genName + '.' +
+            (o.next ? 'nextval' : 'currval') +
+            (o.alias ? ' ' + o.alias : '');
+    }
+    _serializeReturning() {
+        return '';
+    }
+}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@sqb/oracle-dialect",
   "description": "SQB serialization extension for Oracle database",
-  "version": "4.1.5",
+  "version": "4.5.0",
   "author": "Panates",
   "contributors": [
-    "Eray Hanoglu <e.hanoglu@panates.com>"
+    "Eray Hanoglu <e.hanoglu@panates.com>",
+    "Ilker Gurelli <i.gurelli@panates.com>"
   ],
   "license": "Apache-2.0",
   "repository": {
@@ -12,47 +13,55 @@
     "url": "https://github.com/sqbjs/sqb.git",
     "directory": "packages/oracle-dialect"
   },
-  "keywords": [
-    "javascript",
-    "typescript",
-    "sql",
-    "query",
-    "builder",
-    "dialect",
-    "oracle",
-    "database"
-  ],
-  "dependencies": {
-    "compare-versions": "^4.1.3"
-  },
-  "devDependencies": {
-    "fast-glob": "^3.2.11"
+  "scripts": {
+    "compile": "tsc",
+    "prebuild": "npm run lint && npm run clean",
+    "build": "npm run build:cjs && npm run build:esm",
+    "build:cjs": "tsc -b tsconfig-build-cjs.json",
+    "build:esm": "tsc -b tsconfig-build-esm.json",
+    "postbuild": "cp README.md package.json ../../LICENSE ../../build/oracle-dialect && cp ../../package.cjs.json ../../build/oracle-dialect/cjs/package.json",
+    "lint": "eslint .",
+    "test": "jest",
+    "cover": "jest --collect-coverage",
+    "clean": "npm run clean:src | npm run clean:dist | npm run clean:cover",
+    "clean:src": "ts-cleanup -s src --all",
+    "clean:dist": "rimraf ../../build/oracle-dialect",
+    "clean:cover": "rimraf ../../coverage/oracle-dialect"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.1.4"
+    "@sqb/builder": "^4.5.0"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "engines": {
-    "node": ">= 16.0"
+  "type": "module",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "types": "esm/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./cjs/index.js",
+      "default": "./esm/index.js"
+    },
+    "./cjs": "./cjs/index.js",
+    "./esm": "./esm/index.js"
   },
-  "directories": {
-    "lib": "dist",
-    "test": "test"
+  "engines": {
+    "node": ">=16.0",
+    "npm": ">=7.0.0"
   },
   "files": [
+    "bin/",
+    "cjs/",
+    "esm/",
     "LICENSE",
-    "README",
-    "dist/"
+    "README.md"
   ],
-  "scripts": {
-    "build": "tsc -b tsconfig-build.json",
-    "prebuild": "npm run lint && npm run clean:dist",
-    "postbuild": "copyfiles package.json README.md LICENSE ../../build/oracle-dialect",
-    "clean": "ts-cleanup -s src --all & ts-cleanup -s test",
-    "clean:dist": "rimraf ../../build/oracle-dialect",
-    "compile": "tsc",
-    "lint": "eslint src/** --no-error-on-unmatched-pattern",
-    "test": "TS_NODE_PROJECT='./test/tsconfig.json' mocha -r ts-node/register -r tsconfig-paths/register --reporter spec test/**/*.spec.ts"
-  }
-}
+  "keywords": [
+    "sqb",
+    "oracle",
+    "sql",
+    "query",
+    "builder",
+    "dialect",
+    "serializer",
+    "database"
+  ]
+}

package/dist/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const builder_1 = require("@sqb/builder");
-const OracleSerializer_1 = require("./OracleSerializer");
-(0, builder_1.registerSerializer)(new OracleSerializer_1.OracleSerializer());