@l-v-yonsama/multi-platform-database-drivers 0.11.15 → 0.13.20

package/README.md

@@ -6,6 +6,11 @@ cd ./docker
 docker compose -f unit-test.yml build
 
 docker compose -f unit-test.yml up -d
+
+cd ..
+cat __tests__/setup/mssql/init.sql| docker exec -i mssql_container \
+  /opt/mssql-tools/bin/sqlcmd \
+  -S localhost -U sa -P 'Pass123zxcv!'
 ```
 
 ```sh

package/built/schema/log-parse-config.schema.json

@@ -0,0 +1,406 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "additionalProperties": false,
+    "definitions": {
+        "BuiltInPattern": {
+            "enum": [
+                "DATA",
+                "EPOCH_TIMESTAMP",
+                "GREEDY_DATA",
+                "GREEDY_MULTILINE",
+                "INT",
+                "ISO8601_LENIENT",
+                "ISO8601_STRICT",
+                "JUL_TIMESTAMP",
+                "LEVEL",
+                "LOGGER",
+                "NUMBER",
+                "SLASH_TIMESTAMP",
+                "WORD"
+            ],
+            "type": "string"
+        },
+        "ExtractorStepAction": {
+            "enum": [
+                "captureColumns",
+                "captureError",
+                "captureErrorDetail",
+                "captureField",
+                "captureParams",
+                "captureResult",
+                "captureRow",
+                "captureSql"
+            ],
+            "type": "string"
+        },
+        "FrameworkName": {
+            "description": "Known SQL framework names used by built-in extractors.\nCustom names are also allowed.",
+            "enum": [
+                "Doma",
+                "Hibernate",
+                "MyBatis",
+                "S2Jdbc",
+                "SpringJdbc"
+            ],
+            "type": "string"
+        },
+        "LogEventField": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/LogEventFieldRegex",
+                    "description": "Field parsed using a custom regular expression."
+                },
+                {
+                    "$ref": "#/definitions/LogEventFieldLiteral",
+                    "description": "Field representing a fixed literal string."
+                },
+                {
+                    "$ref": "#/definitions/LogEventFieldLineBreakLiteral",
+                    "description": "Field representing a line break in multiline logs."
+                },
+                {
+                    "$ref": "#/definitions/LogEventFieldBuiltin",
+                    "description": "Field parsed using a built-in pattern."
+                }
+            ],
+            "description": "Defines a single field in a log event.\nEach field can be a regex, literal text, builtin pattern, or line-break marker."
+        },
+        "LogEventFieldBuiltin": {
+            "additionalProperties": false,
+            "description": "Field parsed using a built-in pattern.",
+            "properties": {
+                "enclosure": {
+                    "$ref": "#/definitions/LogEventFieldEnclosure",
+                    "description": "Optional enclosure characters around the field."
+                },
+                "eventStartMarker": {
+                    "description": "Indicates that this field marks the start of a log event.",
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "pattern": {
+                    "$ref": "#/definitions/BuiltInPattern"
+                },
+                "type": {
+                    "const": "builtin",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "eventStartMarker",
+                "name",
+                "pattern",
+                "type"
+            ],
+            "type": "object"
+        },
+        "LogEventFieldEnclosure": {
+            "enum": [
+                "()",
+                "[]"
+            ],
+            "type": "string"
+        },
+        "LogEventFieldLineBreakLiteral": {
+            "additionalProperties": false,
+            "description": "Field representing a line break in multiline logs.",
+            "properties": {
+                "enclosure": {
+                    "$ref": "#/definitions/LogEventFieldEnclosure",
+                    "description": "Optional enclosure characters around the field."
+                },
+                "eventStartMarker": {
+                    "description": "Indicates that this field marks the start of a log event.",
+                    "type": "boolean"
+                },
+                "type": {
+                    "const": "line-break-literal",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "eventStartMarker",
+                "type"
+            ],
+            "type": "object"
+        },
+        "LogEventFieldLiteral": {
+            "additionalProperties": false,
+            "description": "Field representing a fixed literal string.",
+            "properties": {
+                "enclosure": {
+                    "$ref": "#/definitions/LogEventFieldEnclosure",
+                    "description": "Optional enclosure characters around the field."
+                },
+                "eventStartMarker": {
+                    "description": "Indicates that this field marks the start of a log event.",
+                    "type": "boolean"
+                },
+                "pattern": {
+                    "type": "string"
+                },
+                "type": {
+                    "const": "literal",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "eventStartMarker",
+                "pattern",
+                "type"
+            ],
+            "type": "object"
+        },
+        "LogEventFieldRegex": {
+            "additionalProperties": false,
+            "description": "Field parsed using a custom regular expression.",
+            "properties": {
+                "enclosure": {
+                    "$ref": "#/definitions/LogEventFieldEnclosure",
+                    "description": "Optional enclosure characters around the field."
+                },
+                "eventStartMarker": {
+                    "description": "Indicates that this field marks the start of a log event.",
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "pattern": {
+                    "type": "string"
+                },
+                "type": {
+                    "const": "regex",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "eventStartMarker",
+                "name",
+                "pattern",
+                "type"
+            ],
+            "type": "object"
+        },
+        "LogEventType": {
+            "enum": [
+                "CONN_AUTOCOMMIT",
+                "CONN_TRANSACTIONAL",
+                "DATA_SOURCE",
+                "DDL",
+                "ERROR",
+                "FW_ERROR",
+                "NORMAL",
+                "SQL_COLUMNS",
+                "SQL_ERROR",
+                "SQL_ERROR_DETAIL",
+                "SQL_PARAMS",
+                "SQL_RESULT",
+                "SQL_ROW",
+                "SQL_SINGLE",
+                "SQL_START",
+                "TX_BEGIN",
+                "TX_COMMIT",
+                "TX_METHOD_ENTER",
+                "TX_METHOD_EXIT",
+                "TX_ROLLBACK"
+            ],
+            "type": "string"
+        }
+    },
+    "description": "Root configuration for the log parser.\nDefines how logs are split into events, classified, and converted into SQL executions.",
+    "properties": {
+        "classify": {
+            "description": "Rules used to classify log events into semantic event types.",
+            "items": {
+                "additionalProperties": false,
+                "description": "Rule used to classify a log event into a semantic event type.",
+                "properties": {
+                    "context": {
+                        "description": "Optional context extraction rules.",
+                        "items": {
+                            "additionalProperties": false,
+                            "properties": {
+                                "contextName": {
+                                    "type": "string"
+                                },
+                                "eventFieldName": {
+                                    "type": "string"
+                                },
+                                "pattern": {
+                                    "type": "string"
+                                },
+                                "replace": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "contextName",
+                                "pattern",
+                                "replace"
+                            ],
+                            "type": "object"
+                        },
+                        "type": "array"
+                    },
+                    "expandMessage": {
+                        "description": "Expands message to include following lines.",
+                        "type": "boolean"
+                    },
+                    "field": {
+                        "description": "Optional log event field to apply the rule to.",
+                        "type": "string"
+                    },
+                    "pattern": {
+                        "description": "Regular expression used to detect the event.",
+                        "type": "string"
+                    },
+                    "transforms": {
+                        "description": "Optional transformation rule applied to the matched message.",
+                        "items": {
+                            "additionalProperties": false,
+                            "properties": {
+                                "flags": {
+                                    "additionalProperties": false,
+                                    "properties": {
+                                        "dotAll": {
+                                            "type": "boolean"
+                                        },
+                                        "multiline": {
+                                            "type": "boolean"
+                                        }
+                                    },
+                                    "type": "object"
+                                },
+                                "pattern": {
+                                    "type": "string"
+                                },
+                                "replace": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "pattern",
+                                "replace"
+                            ],
+                            "type": "object"
+                        },
+                        "type": "array"
+                    },
+                    "type": {
+                        "$ref": "#/definitions/LogEventType",
+                        "description": "Target event type when the rule matches."
+                    }
+                },
+                "required": [
+                    "pattern",
+                    "type"
+                ],
+                "type": "object"
+            },
+            "type": "array"
+        },
+        "extractors": {
+            "description": "SQL extraction state machines used to build SQL execution events.",
+            "items": {
+                "additionalProperties": false,
+                "description": "SQL extractor definition using a simple state machine.",
+                "properties": {
+                    "framework": {
+                        "$ref": "#/definitions/FrameworkName",
+                        "description": "Optional framework name associated with the extractor.\nKnown frameworks will appear in IDE completion."
+                    },
+                    "name": {
+                        "description": "Unique name of the extractor.",
+                        "type": "string"
+                    },
+                    "start": {
+                        "$ref": "#/definitions/LogEventType",
+                        "description": "Event type that starts SQL extraction."
+                    },
+                    "steps": {
+                        "description": "Sequence of steps used to collect SQL fragments.",
+                        "items": {
+                            "additionalProperties": false,
+                            "description": "Single step in the SQL extraction state machine.",
+                            "properties": {
+                                "action": {
+                                    "$ref": "#/definitions/ExtractorStepAction",
+                                    "description": "Action performed when the step is triggered."
+                                },
+                                "field": {
+                                    "description": "Target field where extracted value will be stored.",
+                                    "enum": [
+                                        "daoClass",
+                                        "daoMethod",
+                                        "endLine",
+                                        "error",
+                                        "errorDetail",
+                                        "formattedSql",
+                                        "framework",
+                                        "params",
+                                        "result",
+                                        "schema",
+                                        "sql",
+                                        "startLine",
+                                        "table",
+                                        "thread",
+                                        "timestamp",
+                                        "type"
+                                    ],
+                                    "type": "string"
+                                },
+                                "optional": {
+                                    "description": "Whether this step is optional.",
+                                    "type": "boolean"
+                                },
+                                "type": {
+                                    "$ref": "#/definitions/LogEventType",
+                                    "description": "Event type that triggers this step."
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ],
+                            "type": "object"
+                        },
+                        "type": "array"
+                    }
+                },
+                "required": [
+                    "name",
+                    "start",
+                    "steps"
+                ],
+                "type": "object"
+            },
+            "type": "array"
+        },
+        "split": {
+            "additionalProperties": false,
+            "description": "Configuration used to split raw log text into structured log events.",
+            "properties": {
+                "fields": {
+                    "description": "Ordered list of field definitions used to parse a log line.",
+                    "items": {
+                        "$ref": "#/definitions/LogEventField"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "fields"
+            ],
+            "type": "object"
+        }
+    },
+    "required": [
+        "classify",
+        "extractors",
+        "split"
+    ],
+    "type": "object"
+}
+

package/built/src/drivers/memcache/helper.js

@@ -53,7 +53,7 @@ function cachedumpAsync(client, server, slabId, limit) {
                 resolve([]);
             }
             else {
-                const copied = JSON.parse(JSON.stringify(results));
+                const copied = structuredClone(results);
                 resolve(Array.isArray(copied) ? copied : [copied]);
             }
         });

package/built/src/drivers/memcache/helper.js.map

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

package/built/src/helpers/SQLHelper.d.ts

@@ -1,7 +1,12 @@
 import { DiffToUndoChangesResult, RdhKey } from '@l-v-yonsama/rdh';
 import { DbSchema } from '../resource';
 import { DbTable } from '../resource/DbResource';
-import { BindOptions, CreateTableDefinitionsForPromptParams, Proposal, ProposalParams, QStatement, QueryWithBindsResult, ResourcePosition, ResourcePositionParams, SQLLang, ToViewDataQueryParams } from '../types';
+import { BindOptions, CreateTableDefinitionsForPromptParams, DBType, Proposal, ProposalParams, QStatement, QueryWithBindsResult, ResourcePosition, ResourcePositionParams, SQLLang, ToViewDataQueryParams } from '../types';
+import { FormatOptionsWithLanguage, SqlLanguage } from 'sql-formatter';
+export declare const getSqlLanguage: (dbType: DBType) => SqlLanguage;
+export declare const formatQuery: (query: string, cfg?: Partial<FormatOptionsWithLanguage> & {
+    dbType?: DBType;
+}) => string;
 export declare const createUndoChangeSQL: ({ schemaName, tableName, columns, diffResult, bindOption, quote, sqlLang, idQuoteCharacter, }: {
     schemaName?: string;
     tableName: string;
@@ -54,7 +59,7 @@ export declare const toDeleteStatement: ({ schemaName, tableName, columns, condi
     idQuoteCharacter?: string;
     sqlLang?: SQLLang;
 }) => QueryWithBindsResult;
-export declare function toViewRecordsQuery({ tableRes, schemaName, idQuoteCharacter, sqlLang, limit, limitAsTop, limitMode, limitLastColumn }: ToViewDataQueryParams & {
+export declare function toViewRecordsQuery({ tableRes, schemaName, idQuoteCharacter, sqlLang, limit, limitAsTop, limitMode, limitLastColumn, }: ToViewDataQueryParams & {
     limitMode: 'top' | 'last';
     limitLastColumn?: string;
 }): string;

package/built/src/helpers/SQLHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.separateMultipleQueries = exports.toCreateTableDDL = exports.needsQuoting = exports.wrapQuote = exports.wrapBackQuote = exports.wrapDoubleQuote = exports.wrapSingleQuote = exports.resolveLastOrderByColumn = exports.getResourcePositions = exports.getProposals = exports.createTableDefinisionsForPrompt = exports.normalizeSimpleParametersQuery = exports.normalizePositionedParametersQuery = exports.normalizeQuery = exports.parseQuery = exports.hasSetVariableClause = exports.toSafeQueryForPgsqlAst = exports.toViewDataNormalizedQuery = exports.toViewDataQuery = exports.createColumnNames = exports.createTableNames = exports.toCountRecordsQuery = exports.toViewRecordsQuery = exports.toDeleteStatement = exports.toUpdateStatement = exports.toInsertStatement = exports.createUndoChangeSQL = void 0;
+exports.separateMultipleQueries = exports.toCreateTableDDL = exports.needsQuoting = exports.wrapQuote = exports.wrapBackQuote = exports.wrapDoubleQuote = exports.wrapSingleQuote = exports.resolveLastOrderByColumn = exports.getResourcePositions = exports.getProposals = exports.createTableDefinisionsForPrompt = exports.normalizeSimpleParametersQuery = exports.normalizePositionedParametersQuery = exports.normalizeQuery = exports.parseQuery = exports.hasSetVariableClause = exports.toSafeQueryForPgsqlAst = exports.toViewDataNormalizedQuery = exports.toViewDataQuery = exports.createColumnNames = exports.createTableNames = exports.toCountRecordsQuery = exports.toViewRecordsQuery = exports.toDeleteStatement = exports.toUpdateStatement = exports.toInsertStatement = exports.createUndoChangeSQL = exports.formatQuery = exports.getSqlLanguage = void 0;
 const tslib_1 = require("tslib");
 const rdh_1 = require("@l-v-yonsama/rdh");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
@@ -11,6 +11,45 @@ const DbResource_1 = require("../resource/DbResource");
 const types_1 = require("../types");
 const constant_1 = require("./constant");
 const RuleEngine_1 = require("./RuleEngine");
+const sql_formatter_1 = require("sql-formatter");
+const DEFAULT_FORMAT_OPTIONS = {
+    language: 'mysql',
+    tabWidth: 2,
+    useTabs: false,
+    keywordCase: 'upper',
+    identifierCase: 'preserve',
+    dataTypeCase: 'upper',
+    functionCase: 'upper',
+    indentStyle: 'standard',
+    logicalOperatorNewline: 'before',
+    expressionWidth: 120,
+    linesBetweenQueries: 1,
+    denseOperators: false,
+    newlineBeforeSemicolon: false,
+};
+const DBTypeToSqlLanguageMap = {
+    MySQL: 'mysql',
+    Postgres: 'postgresql',
+    SQLServer: 'transactsql',
+    SQLite: 'sqlite',
+    Redis: 'mysql',
+    Memcache: 'mysql',
+    Keycloak: 'mysql',
+    Auth0: 'mysql',
+    Aws: 'mysql',
+    Mqtt: 'mysql',
+};
+const getSqlLanguage = (dbType) => {
+    return DBTypeToSqlLanguageMap[dbType];
+};
+exports.getSqlLanguage = getSqlLanguage;
+const formatQuery = (query, cfg) => {
+    const _a = cfg !== null && cfg !== void 0 ? cfg : {}, { dbType, language } = _a, rest = tslib_1.__rest(_a, ["dbType", "language"]);
+    const resolvedLanguage = language !== null && language !== void 0 ? language : (dbType ? (0, exports.getSqlLanguage)(dbType) : undefined);
+    const merged = Object.assign(Object.assign(Object.assign({}, DEFAULT_FORMAT_OPTIONS), rest), (resolvedLanguage ? { language: resolvedLanguage } : {}));
+    return (0, sql_formatter_1.format)(query, merged);
+};
+exports.formatQuery = formatQuery;
 const createUndoChangeSQL = ({ schemaName, tableName, columns, diffResult, bindOption, quote, sqlLang, idQuoteCharacter, }) => {
     const { ok, toBeInserted, toBeUpdated, toBeDeleted } = diffResult;
     if (!ok) {
@@ -253,7 +292,7 @@ const toDeleteStatement = ({ schemaName, tableName, columns, conditions, bindOpt
     };
 };
 exports.toDeleteStatement = toDeleteStatement;
-function toViewRecordsQuery({ tableRes, schemaName, idQuoteCharacter, sqlLang, limit, limitAsTop, limitMode, limitLastColumn }) {
+function toViewRecordsQuery({ tableRes, schemaName, idQuoteCharacter, sqlLang, limit, limitAsTop, limitMode, limitLastColumn, }) {
     const tableNameWithSchema = createTableNameWithSchema({
         schema: schemaName,
         table: tableRes.name,