@l-v-yonsama/multi-platform-database-drivers 1.0.0 → 1.1.2

package/built/src/utils/log/buildSqlExecutions.js

@@ -4,6 +4,7 @@ exports.splitMyBatisParams = exports.buildSqlExecutions = void 0;
 const helpers_1 = require("../../helpers");
 const removeSqlComments_1 = require("./sql/removeSqlComments");
 function buildSqlExecutions({ fragments, language, }) {
+    var _a, _b;
     const sqlExecutions = [];
     const builders = new Map();
     const getBuilder = (thread) => {
@@ -81,7 +82,7 @@ function buildSqlExecutions({ fragments, language, }) {
                 endLine: calcLine(fragment),
                 timestamp: fragment.timestamp,
                 thread: fragment.thread,
-                sql: '',
+                sql: (_a = extractSqlFromErrorText(fragment.value)) !== null && _a !== void 0 ? _a : '',
                 formattedSql: '',
                 framework: fragment.framework,
                 daoClass: fragment.daoClass,
@@ -106,6 +107,9 @@ function buildSqlExecutions({ fragments, language, }) {
         }
         if (fragment.type === 'SQL_ERROR_DETAIL') {
             builder.current.errorDetail = fragment.value;
+            if (!builder.current.sql) {
+                builder.current.sql = (_b = extractSqlFromErrorText(fragment.value)) !== null && _b !== void 0 ? _b : '';
+            }
             finalizeExecution(builder);
         }
     }
@@ -182,7 +186,7 @@ function normalizeHibernateSql(sql, params) {
             values.push('NULL');
             continue;
         }
-        if (/^\d+(\.\d+)?$/.test(value)) {
+        if (isNumericLiteral(value)) {
             values.push(value);
         }
         else {
@@ -194,7 +198,7 @@ function normalizeHibernateSql(sql, params) {
 function normalizeSpringJdbcSql(sql, params) {
     const values = [];
     for (const line of params) {
-        const m = line.match(/parameter value \[([^\]]*)\]/);
+        const m = line.match(/parameter value \[(.*?)\], value class/);
         if (!m)
             continue;
         const value = m[1];
@@ -202,7 +206,7 @@ function normalizeSpringJdbcSql(sql, params) {
             values.push('NULL');
             continue;
         }
-        if (/^\d+(\.\d+)?$/.test(value)) {
+        if (isNumericLiteral(value)) {
             values.push(value);
         }
         else {
@@ -211,9 +215,12 @@ function normalizeSpringJdbcSql(sql, params) {
     }
     return applyParameters(sql, values);
 }
+function isNumericLiteral(value) {
+    return /^[-+]?(\d+(\.\d+)?|\.\d+)([eE][-+]?\d+)?$/.test(value);
+}
 function splitMyBatisParams(body) {
     const result = [];
-    const regex = /(null|[\s\S]*?\((?:String|Integer|Long|Short|Byte|Double|Float|Boolean|Timestamp|Date|Time|BigDecimal)\))(?:,\s*)?/g;
+    const regex = /(null|[\s\S]*?\([A-Za-z_$][\w.$]*(?:\[\])?\))(?:,\s*)?/g;
     let match;
     while ((match = regex.exec(body)) !== null) {
         result.push(match[1].trim());
@@ -250,16 +257,38 @@ function isNumericType(type) {
         'Double',
         'Float',
         'BigDecimal',
+        'BigInteger',
     ].includes(type);
 }
 function applyParameters(sql, params) {
     let index = 0;
-    return sql.replace(/\?/g, () => {
-        if (index >= params.length)
-            return '?';
-        const value = params[index++];
-        return value.replace(/\r?\n/g, ' ').replace(/\s+/g, ' ');
-    });
+    return (0, removeSqlComments_1.splitByStringLiterals)(sql)
+        .map((segment) => {
+        if (segment.inString)
+            return segment.text;
+        return segment.text.replace(/\?/g, () => {
+            if (index >= params.length)
+                return '?';
+            const value = params[index++];
+            return value.replace(/\r?\n/g, ' ').replace(/\s+/g, ' ');
+        });
+    })
+        .join('');
+}
+function extractSqlFromErrorText(text) {
+    const domaMatch = text.match(/SQL=\[([^\]]*)\]/);
+    if (domaMatch && domaMatch[1].trim()) {
+        return domaMatch[1].trim();
+    }
+    const springJdbcMatch = text.match(/SQL \[([^\]]*)\]/);
+    if (springJdbcMatch && springJdbcMatch[1].trim()) {
+        return springJdbcMatch[1].trim();
+    }
+    const h2Match = text.match(/SQL statement:\s*\r?\n?\s*([\s\S]*?)\s*\[\w[\w-]*\]/);
+    if (h2Match && h2Match[1].trim()) {
+        return h2Match[1].trim();
+    }
+    return undefined;
 }
 function escapeSqlString(value) {
     return value.replace(/'/g, "''");

package/built/src/utils/log/buildSqlExecutions.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildSqlExecutions.js","sourceRoot":"","sources":["../../../../src/utils/log/buildSqlExecutions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildSqlExecutions.js","sourceRoot":"","sources":["../../../../src/utils/log/buildSqlExecutions.ts"],"names":[],"mappings":"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"}

package/built/src/utils/log/extract/runExtractors.js

@@ -1,21 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runExtractors = void 0;
+const DEFAULT_THREAD_KEY = '__default__';
+function threadKeyOf(event) {
+    var _a;
+    return ((_a = event.thread) === null || _a === void 0 ? void 0 : _a.trim()) || DEFAULT_THREAD_KEY;
+}
 function runExtractors(events, extractors) {
     var _a, _b;
     const results = [];
-    const states = extractors.map(() => ({
-        stepIndex: -1,
-        buffer: [],
-    }));
-    let daoClass;
-    let daoMethod;
+    const statesByThread = new Map();
+    const daoContextByThread = new Map();
+    const getStates = (threadKey) => {
+        let states = statesByThread.get(threadKey);
+        if (!states) {
+            states = extractors.map(() => ({
+                stepIndex: -1,
+                buffer: [],
+            }));
+            statesByThread.set(threadKey, states);
+        }
+        return states;
+    };
+    const getDaoContext = (threadKey) => {
+        let context = daoContextByThread.get(threadKey);
+        if (!context) {
+            context = {};
+            daoContextByThread.set(threadKey, context);
+        }
+        return context;
+    };
     for (const event of events) {
+        const threadKey = threadKeyOf(event);
+        const states = getStates(threadKey);
+        const daoContext = getDaoContext(threadKey);
         if ((_a = event.eventContext) === null || _a === void 0 ? void 0 : _a.daoClass) {
-            daoClass = event.eventContext.daoClass;
+            daoContext.daoClass = event.eventContext.daoClass;
         }
         if ((_b = event.eventContext) === null || _b === void 0 ? void 0 : _b.daoMethod) {
-            daoMethod = event.eventContext.daoMethod;
+            daoContext.daoMethod = event.eventContext.daoMethod;
         }
         extractors.forEach((extractor, i) => {
             var _a, _b;
@@ -46,8 +69,8 @@ function runExtractors(events, extractors) {
                         thread: event.thread,
                         framework: extractor.framework,
                         value,
-                        daoClass,
-                        daoMethod,
+                        daoClass: daoContext.daoClass,
+                        daoMethod: daoContext.daoMethod,
                     };
                     if (step.action === 'captureSql') {
                         state.buffer.push(Object.assign(Object.assign({}, baseFragment), { type: step.type === 'SQL_SINGLE' ? 'SQL_SINGLE' : 'SQL' }));
@@ -88,10 +111,12 @@ function runExtractors(events, extractors) {
             state.stepIndex = idx;
         });
     }
-    states.forEach((state) => {
-        if (state.buffer.length > 0) {
-            results.push(...state.buffer);
-        }
+    statesByThread.forEach((states) => {
+        states.forEach((state) => {
+            if (state.buffer.length > 0) {
+                results.push(...state.buffer);
+            }
+        });
     });
     return results.sort((a, b) => {
         var _a, _b;

package/built/src/utils/log/extract/runExtractors.js.map

@@ -1 +1 @@
-{"version":3,"file":"runExtractors.js","sourceRoot":"","sources":["../../../../../src/utils/log/extract/runExtractors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runExtractors.js","sourceRoot":"","sources":["../../../../../src/utils/log/extract/runExtractors.ts"],"names":[],"mappings":"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"}

package/built/src/utils/log/sql/removeSqlComments.d.ts

@@ -1 +1,6 @@
+export type SqlSegment = {
+    text: string;
+    inString: boolean;
+};
+export declare function splitByStringLiterals(sql: string): SqlSegment[];
 export declare function removeSqlComments(sql: string): string;

package/built/src/utils/log/sql/removeSqlComments.js

@@ -1,10 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSqlComments = void 0;
+exports.removeSqlComments = exports.splitByStringLiterals = void 0;
+function splitByStringLiterals(sql) {
+    const segments = [];
+    let current = '';
+    let quoteChar = null;
+    let i = 0;
+    while (i < sql.length) {
+        const ch = sql[i];
+        if (quoteChar) {
+            current += ch;
+            if (ch === quoteChar) {
+                if (sql[i + 1] === quoteChar) {
+                    current += sql[i + 1];
+                    i += 2;
+                    continue;
+                }
+                segments.push({ text: current, inString: true });
+                current = '';
+                quoteChar = null;
+            }
+            i++;
+            continue;
+        }
+        if (ch === "'" || ch === '"' || ch === '`') {
+            if (current) {
+                segments.push({ text: current, inString: false });
+                current = '';
+            }
+            quoteChar = ch;
+            current = ch;
+            i++;
+            continue;
+        }
+        current += ch;
+        i++;
+    }
+    if (current) {
+        segments.push({ text: current, inString: quoteChar !== null });
+    }
+    return segments;
+}
+exports.splitByStringLiterals = splitByStringLiterals;
 function removeSqlComments(sql) {
-    return sql
-        .replace(/\/\*[\s\S]*?\*\//g, '')
-        .replace(/^\s*--.*$/gm, '')
+    return splitByStringLiterals(sql)
+        .map((segment) => {
+        if (segment.inString)
+            return segment.text;
+        return segment.text
+            .replace(/\/\*[\s\S]*?\*\//g, '')
+            .replace(/^\s*--.*$/gm, '');
+    })
+        .join('')
         .trim();
 }
 exports.removeSqlComments = removeSqlComments;

package/built/src/utils/log/sql/removeSqlComments.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeSqlComments.js","sourceRoot":"","sources":["../../../../../src/utils/log/sql/removeSqlComments.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,OAAO,GAAG;SACP,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;SAChC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,IAAI,EAAE,CAAC;AACZ,CAAC;AALD,8CAKC"}
+{"version":3,"file":"removeSqlComments.js","sourceRoot":"","sources":["../../../../../src/utils/log/sql/removeSqlComments.ts"],"names":[],"mappings":";;;AAUA,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,QAAQ,GAAiB,EAAE,CAAC;IAClC,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE;QACrB,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAElB,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,EAAE,CAAC;YACd,IAAI,EAAE,KAAK,SAAS,EAAE;gBACpB,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS,EAAE;oBAC5B,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtB,CAAC,IAAI,CAAC,CAAC;oBACP,SAAS;iBACV;gBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjD,OAAO,GAAG,EAAE,CAAC;gBACb,SAAS,GAAG,IAAI,CAAC;aAClB;YACD,CAAC,EAAE,CAAC;YACJ,SAAS;SACV;QAED,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE;YAC1C,IAAI,OAAO,EAAE;gBACX,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;gBAClD,OAAO,GAAG,EAAE,CAAC;aACd;YACD,SAAS,GAAG,EAAE,CAAC;YACf,OAAO,GAAG,EAAE,CAAC;YACb,CAAC,EAAE,CAAC;YACJ,SAAS;SACV;QAED,OAAO,IAAI,EAAE,CAAC;QACd,CAAC,EAAE,CAAC;KACL;IAED,IAAI,OAAO,EAAE;QACX,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,KAAK,IAAI,EAAE,CAAC,CAAC;KAChE;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA7CD,sDA6CC;AAED,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,OAAO,qBAAqB,CAAC,GAAG,CAAC;SAC9B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,IAAI,OAAO,CAAC,QAAQ;YAAE,OAAO,OAAO,CAAC,IAAI,CAAC;QAE1C,OAAO,OAAO,CAAC,IAAI;aAChB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;aAChC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC;SACR,IAAI,EAAE,CAAC;AACZ,CAAC;AAXD,8CAWC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@l-v-yonsama/multi-platform-database-drivers",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "description": "multi-platform database drivers in TypeScript.",
   "engines": {
     "node": ">= 18"
@@ -16,6 +16,7 @@
     "@types/memcached": "^2.2.10",
     "@types/mssql": "^9.1.5",
     "@types/node": "~18",
+    "@types/oracledb": "^7.0.1",
     "@types/pg": "^8.6.6",
     "@types/pluralize": "^0.0.29",
     "@types/sql.js": "^1.4.9",
@@ -30,8 +31,6 @@
     "ts-jest": "~29.0",
     "tslib": "^2.6.3",
     "tsutils": "~3.21",
-    "typedoc": "^0.25.1",
-    "typedoc-plugin-markdown": "^3.16.0",
     "typescript": "~4.9",
     "typescript-json-schema": "^0.67.1"
   },
@@ -40,13 +39,12 @@
     "clean": "rimraf coverage built tmp *.tgz __tests__/data/logs/parse/*.json",
     "clean:examples": "rimraf built/src/examples",
     "prebuild": "npm run lint",
-    "doc": "typedoc",
     "build": "npm run clean && tsc -p tsconfig.json",
     "build:watch": "npm run clean && tsc -w -p tsconfig.json",
     "build:schema": "typescript-json-schema tsconfig.json LogParseConfig --required --noExtraProps --out schema/log-parse-config.schema.json",
     "build:core": "npm run clean && tsc -p tsconfig.release.json && npm run build:schema && cp -r schema built/schema",
     "build:pack": "npm run build:core && npm run clean:examples && npm pack",
-    "build:release": "npm run build:core && npm run clean:examples && npm run doc",
+    "build:release": "npm run build:core && npm run clean:examples",
     "prepublishOnly": "npm run build:release",
     "lint": "eslint . --ext .ts --ext .mts",
     "lint:fix": "eslint --fix . --ext .ts --ext .mts",
@@ -71,6 +69,7 @@
     "test:driver:mssql": "npm run clean && jest __tests__/db/drivers/SQLServerDriver.test.ts",
     "test:driver:postgres": "npm run clean && jest __tests__/db/drivers/PostgresDriver.test.ts",
     "test:driver:sqlite": "npm run clean && jest __tests__/db/drivers/SQLiteDriver.test.ts",
+    "test:driver:oracle": "npm run clean && jest __tests__/db/drivers/OracleDriver.test.ts",
     "test:driver:redis": "npm run clean && jest __tests__/db/drivers/RedisDriver.test.ts",
     "test:driver:auth0": "npm run clean && jest __tests__/db/drivers/Auth0Driver.test.ts",
     "test:driver:keycloak": "npm run clean && jest __tests__/db/drivers/KeycloakDriver.test.ts",
@@ -116,6 +115,7 @@
     "mssql": "^11.0.1",
     "mysql2": "^3.1.2",
     "openid-client": "^5.6.1",
+    "oracledb": "^7.0.1",
     "pg": "^8.9.0",
     "pgsql-ast-parser": "^11.0.1",
     "pluralize": "^8.0.0",