@l-v-yonsama/multi-platform-database-drivers 0.1.30 → 0.1.32

package/built/src/{db/drivers → drivers}/AwsS3Driver.d.ts

@@ -1,6 +1,7 @@
-import { BaseDriver, RequestSqlOptions } from './BaseDriver';
-import { DbConnection, DbDatabase, TableRows, SchemaAndTableHints, ResultSetDataHolder } from '../resource';
 import { PutObjectCommandInput, S3Client, S3ClientConfig } from '@aws-sdk/client-s3';
+import { BaseDriver, RequestSqlOptions } from './BaseDriver';
+import { DbConnection, DbDatabase, DbKey, ResultSetDataHolder, S3KeyParams } from '../resource';
+import { ScanParams } from '../types';
 export declare class AwsS3Driver extends BaseDriver {
     s3Client: S3Client;
     finder: any;
@@ -8,8 +9,8 @@ export declare class AwsS3Driver extends BaseDriver {
     constructor(conRes: DbConnection);
     connectSub(): Promise<string>;
     test(with_connect?: boolean): Promise<string>;
-    countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
     abortSearch(): void;
+    scan(params: ScanParams): Promise<DbKey<S3KeyParams>[]>;
     getInfomationSchemas(options: {
         progress_callback?: Function | undefined;
         params?: any;

package/built/src/{db/drivers → drivers}/AwsS3Driver.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwsS3Driver = void 0;
 const tslib_1 = require("tslib");
+const client_s3_1 = require("@aws-sdk/client-s3");
 const BaseDriver_1 = require("./BaseDriver");
 const resource_1 = require("../resource");
-const client_s3_1 = require("@aws-sdk/client-s3");
+const types_1 = require("../types");
 class AwsS3Driver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -20,7 +21,7 @@ class AwsS3Driver extends BaseDriver_1.BaseDriver {
                 accessKeyId: this.conRes.user,
                 secretAccessKey: this.conRes.password,
             };
-            if (this.conRes.dbType === resource_1.DBType.Minio) {
+            if (this.conRes.dbType === types_1.DBType.Minio) {
                 this.config.endpoint = this.conRes.url;
                 this.config.s3ForcePathStyle = 'true';
             }
@@ -49,16 +50,57 @@ class AwsS3Driver extends BaseDriver_1.BaseDriver {
             return errorReason;
         });
     }
-    countTables(tables, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return new Array();
-        });
-    }
     abortSearch() {
         if (this.finder) {
             this.finder.abort();
         }
     }
+    scan(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { target, limit, keyword, withValue } = params;
+            let truncated = true;
+            let pageMarker;
+            const bucketParams = {
+                Bucket: target,
+                Prefix: keyword,
+            };
+            const list = [];
+            while (truncated) {
+                try {
+                    bucketParams.MaxKeys = Math.min(1000, limit - list.length);
+                    const response = yield this.s3Client.send(new client_s3_1.ListObjectsCommand(bucketParams));
+                    response.Contents.forEach((item) => {
+                        const key = new resource_1.DbKey(item.Key, {
+                            etag: item.ETag,
+                            size: item.Size,
+                            storageClass: item.StorageClass,
+                            lastModified: item.LastModified,
+                        });
+                        list.push(key);
+                    });
+                    truncated = response.IsTruncated;
+                    if (truncated) {
+                        pageMarker = response.Contents.slice(-1)[0].Key;
+                        bucketParams.Marker = pageMarker;
+                    }
+                }
+                catch (err) {
+                    console.log('Error', err);
+                    truncated = false;
+                }
+            }
+            if (withValue) {
+                const promises = list.map((it) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it.params.base64 = yield this.getValueByKey({
+                        bucket: target,
+                        key: it.name,
+                    });
+                }));
+                yield Promise.all(promises);
+            }
+            return list;
+        });
+    }
     getInfomationSchemas(options) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.conRes) {

package/built/src/drivers/AwsS3Driver.js.map

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

package/built/src/drivers/AwsSQSDriver.d.ts

@@ -0,0 +1,27 @@
+import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs';
+import { BaseDriver, RequestSqlOptions } from './BaseDriver';
+import { DbConnection, DbDatabase, DbKey, ResultSetDataHolder, SQSMessageParams, SchemaAndTableHints, TableRows } from '../resource';
+import { ScanParams } from '../types';
+export declare class AwsSQSDriver extends BaseDriver {
+    countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
+    sqsClient: SQSClient;
+    finder: any;
+    config: SQSClientConfig;
+    constructor(conRes: DbConnection);
+    connectSub(): Promise<string>;
+    test(with_connect?: boolean): Promise<string>;
+    abortSearch(): void;
+    scan(params: ScanParams): Promise<DbKey<SQSMessageParams>[]>;
+    getInfomationSchemas(options: {
+        progress_callback?: Function | undefined;
+        params?: any;
+    }): Promise<Array<DbDatabase>>;
+    requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
+    createQueue({ name }: {
+        name: string;
+    }): Promise<void>;
+    removeQueue({ url }: {
+        url: string;
+    }): Promise<void>;
+    closeSub(): Promise<string>;
+}

package/built/src/drivers/AwsSQSDriver.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AwsSQSDriver = void 0;
+const tslib_1 = require("tslib");
+const client_sqs_1 = require("@aws-sdk/client-sqs");
+const url = tslib_1.__importStar(require("url"));
+const BaseDriver_1 = require("./BaseDriver");
+const resource_1 = require("../resource");
+const types_1 = require("../types");
+class AwsSQSDriver extends BaseDriver_1.BaseDriver {
+    countTables(tables, options) {
+        throw new Error('Method not implemented.');
+    }
+    constructor(conRes) {
+        super(conRes);
+    }
+    connectSub() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.config = {};
+            this.config.region = types_1.AwsRegion.usWest1;
+            if (this.conRes.region) {
+                this.config.region = this.conRes.region;
+            }
+            this.config.credentials = {
+                accessKeyId: this.conRes.user,
+                secretAccessKey: this.conRes.password,
+            };
+            if (this.conRes.url) {
+                this.config.endpoint = this.conRes.url;
+            }
+            this.sqsClient = new client_sqs_1.SQSClient(this.config);
+            return this.test(false);
+        });
+    }
+    test(with_connect = false) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let errorReason = '';
+            if (with_connect) {
+                errorReason = yield this.connect();
+            }
+            if (this.sqsClient) {
+                try {
+                    const a = yield this.sqsClient.send(new client_sqs_1.ListQueuesCommand({ MaxResults: 1 }));
+                }
+                catch (e) {
+                    errorReason = e.message;
+                }
+            }
+            if (with_connect) {
+                yield this.disconnect();
+            }
+            return errorReason;
+        });
+    }
+    abortSearch() {
+        if (this.finder) {
+            this.finder.abort();
+        }
+    }
+    scan(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { target, limit, keyword } = params;
+            const result = yield this.sqsClient.send(new client_sqs_1.ReceiveMessageCommand({
+                QueueUrl: target,
+                MaxNumberOfMessages: limit,
+            }));
+            let messages = result.Messages;
+            if (keyword) {
+                messages = messages.filter((it) => it.Body.includes(keyword) || it.MessageId.includes(keyword));
+            }
+            return messages.map((it) => {
+                const params = {
+                    body: it.Body,
+                    receiptHandle: it.ReceiptHandle,
+                    md5OfBody: it.MD5OfBody,
+                };
+                return new resource_1.DbKey(it.MessageId, params);
+            });
+        });
+    }
+    getInfomationSchemas(options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!this.conRes) {
+                return [];
+            }
+            const dbResources = new Array();
+            const dbDatabase = new resource_1.DbDatabase('SQS');
+            dbResources.push(dbDatabase);
+            try {
+                let NextToken = undefined;
+                do {
+                    const queues = yield this.sqsClient.send(new client_sqs_1.ListQueuesCommand({ MaxResults: 1000, NextToken }));
+                    if (queues.QueueUrls) {
+                        for (const queueUrl of queues.QueueUrls) {
+                            const name = url.parse(queueUrl).pathname;
+                            const attr = yield this.sqsClient.send(new client_sqs_1.GetQueueAttributesCommand({
+                                QueueUrl: queueUrl,
+                                AttributeNames: ['All'],
+                            }));
+                            const attributes = attr === null || attr === void 0 ? void 0 : attr.Attributes;
+                            const dbQueue = new resource_1.DbSQSQueue(name, queueUrl, attributes);
+                            dbDatabase.addChild(dbQueue);
+                        }
+                    }
+                    NextToken = queues.NextToken;
+                } while (NextToken);
+                dbDatabase.comment = `${dbDatabase.getChildren().length} queues`;
+            }
+            catch (e) {
+                console.error(e);
+            }
+            return dbResources;
+        });
+    }
+    requestSql(sql, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return new resource_1.ResultSetDataHolder([]);
+        });
+    }
+    createQueue({ name }) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.sqsClient.send(new client_sqs_1.CreateQueueCommand({ QueueName: name }));
+        });
+    }
+    removeQueue({ url }) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield this.sqsClient.send(new client_sqs_1.DeleteQueueCommand({ QueueUrl: url }));
+        });
+    }
+    closeSub() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.sqsClient) {
+                this.sqsClient.destroy();
+            }
+            return '';
+        });
+    }
+}
+exports.AwsSQSDriver = AwsSQSDriver;
+//# sourceMappingURL=AwsSQSDriver.js.map

package/built/src/drivers/AwsSQSDriver.js.map

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

package/built/src/{db/drivers → drivers}/BaseDriver.d.ts

@@ -1,5 +1,6 @@
-import { DBError } from '../DBError';
-import { DbConnection, ColumnResolver, DbColumn, SchemaAndTableHints, TableRows, DbDatabase, ResultSetDataHolder } from '../resource';
+import { ColumnResolver, DbColumn, DbConnection, DbDatabase, ResultSetDataHolder, SchemaAndTableHints } from '../resource';
+import { GeneralResult } from '../types';
+import { DBError } from './DBError';
 export declare abstract class BaseDriver {
     isConnected: boolean;
     protected conRes: DbConnection;
@@ -13,6 +14,7 @@ export declare abstract class BaseDriver {
     isQuery(sql: string): boolean;
     createColumnResolver(sql?: string): ColumnResolver;
     parseSchemaAndTableHints(sql: string): SchemaAndTableHints;
+    flow<T = any>(f: () => Promise<T>): Promise<GeneralResult<T>>;
     resetDefaultSchema(database: DbDatabase): void;
     resolveColumn(column: string, resolver?: ColumnResolver): DbColumn | undefined;
     resolveColumnComment(column: string, resolver?: ColumnResolver): string;
@@ -26,7 +28,6 @@ export declare abstract class BaseDriver {
         params?: any;
     }): Promise<Array<DbDatabase>>;
     abstract test(with_connect: boolean): Promise<string>;
-    abstract countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
     abstract requestSql(sql: string, options?: RequestSqlOptions): Promise<ResultSetDataHolder>;
     createDBError(message: string, sourceError: any): DBError;
 }

package/built/src/{db/drivers → drivers}/BaseDriver.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDriver = void 0;
 const tslib_1 = require("tslib");
-const DBError_1 = require("../DBError");
-const resource_1 = require("../resource");
 const tunnel = tslib_1.__importStar(require("tunnel-ssh"));
 const get_port_please_1 = require("get-port-please");
 const fs = tslib_1.__importStar(require("fs"));
+const resource_1 = require("../resource");
+const types_1 = require("../types");
+const DBError_1 = require("./DBError");
 class BaseDriver {
     constructor(conRes) {
         this.conRes = conRes;
@@ -50,6 +51,34 @@ class BaseDriver {
         }
         return ret;
     }
+    flow(f) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let ok = true;
+            let message = yield this.connect();
+            let result;
+            if (message) {
+                return {
+                    ok: false,
+                    message,
+                };
+            }
+            try {
+                result = yield f();
+            }
+            catch (e) {
+                ok = false;
+                message = e.message;
+            }
+            finally {
+                yield this.disconnect();
+            }
+            return {
+                ok,
+                message,
+                result,
+            };
+        });
+    }
     resetDefaultSchema(database) {
         const searchNames = [];
         if (this.conRes.database) {
@@ -61,7 +90,7 @@ class BaseDriver {
         searchNames.push('public');
         for (const searchName of searchNames) {
             const child = database.getChildByName(searchName, {
-                resouceType: resource_1.ResourceType.Schema,
+                resouceType: types_1.ResourceType.Schema,
             });
             if (child) {
                 child.isDefault = true;
@@ -70,7 +99,7 @@ class BaseDriver {
         }
         const child = database
             .getChildren()
-            .find((it) => it.getResouceType() === resource_1.ResourceType.Schema);
+            .find((it) => it.getResouceType() === types_1.ResourceType.Schema);
         if (child) {
             child.isDefault = true;
         }
@@ -82,7 +111,7 @@ class BaseDriver {
         if (this.conRes) {
             for (let i = 0; i < resolver.hints.list.length; i++) {
                 const hints = resolver.hints.list[i];
-                const t = resource_1.ResourceHelper.findResource(this.conRes, resource_1.ResourceType.Table, hints.table);
+                const t = resource_1.ResourceHelper.findResource(this.conRes, types_1.ResourceType.Table, hints.table);
                 if (t) {
                     return t.getChildByName(column, { unwrapQuote: true });
                 }

package/built/src/drivers/BaseDriver.js.map

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

package/built/src/drivers/DBDriverResolver.d.ts

@@ -0,0 +1,12 @@
+import { BaseDriver } from './BaseDriver';
+import { ConnectionSetting } from '../resource';
+export declare class DBDriverResolver {
+    private driverMap;
+    private static instance;
+    static getInstance(): DBDriverResolver;
+    private constructor();
+    getDriverById(connectionId: string): BaseDriver;
+    createDriver<T extends BaseDriver>(setting: ConnectionSetting): T;
+    removeDriver(driver: BaseDriver): void;
+    closeAll(): Promise<string>;
+}

package/built/src/{service → drivers}/DBDriverResolver.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DBDriverResolver = void 0;
 const tslib_1 = require("tslib");
-const db_1 = require("../db");
 const short_unique_id_1 = tslib_1.__importDefault(require("short-unique-id"));
+const resource_1 = require("../resource");
+const types_1 = require("../types");
+const MySQLDriver_1 = require("./MySQLDriver");
+const PostgresDriver_1 = require("./PostgresDriver");
+const RedisDriver_1 = require("./RedisDriver");
+const AwsS3Driver_1 = require("./AwsS3Driver");
+const AwsSQSDriver_1 = require("./AwsSQSDriver");
 const uid = new short_unique_id_1.default();
 class DBDriverResolver {
     static getInstance() {
@@ -13,28 +19,8 @@ class DBDriverResolver {
         return this.instance;
     }
     constructor() {
-        this.connectionList = new Array();
-        this.connectionSettingList = new Array();
         this.driverMap = new Map();
     }
-    addConnectionSetting(setting) {
-        if (this.connectionSettingList.some((it) => it.name === setting.name)) {
-            return;
-        }
-        this.connectionSettingList.push(setting);
-    }
-    removeConnectionSettingByName(name) {
-        const idx = this.connectionSettingList.findIndex((it) => it.name === name);
-        if (idx >= 0) {
-            this.connectionSettingList.splice(idx, 1);
-        }
-    }
-    getConResList() {
-        return this.connectionList;
-    }
-    getSettingByName(defName) {
-        return this.connectionSettingList.find((def) => def.name === defName);
-    }
     getDriverById(connectionId) {
         if (!this.driverMap.has(connectionId)) {
             throw new Error(`Connection resource for 'ID:${connectionId}' not found.`);
@@ -42,26 +28,28 @@ class DBDriverResolver {
         return this.driverMap.get(connectionId);
     }
     createDriver(setting) {
-        const conRes = new db_1.DbConnection(Object.assign(Object.assign({}, setting), { id: uid.randomUUID(8) }));
+        const conRes = new resource_1.DbConnection(Object.assign(Object.assign({}, setting), { id: uid.randomUUID(8) }));
         let driver = undefined;
         switch (conRes.dbType) {
-            case db_1.DBType.MySQL:
-                driver = new db_1.MySQLDriver(conRes);
+            case types_1.DBType.MySQL:
+                driver = new MySQLDriver_1.MySQLDriver(conRes);
+                break;
+            case types_1.DBType.Postgres:
+                driver = new PostgresDriver_1.PostgresDriver(conRes);
                 break;
-            case db_1.DBType.Postgres:
-                driver = new db_1.PostgresDriver(conRes);
+            case types_1.DBType.Redis:
+                driver = new RedisDriver_1.RedisDriver(conRes);
                 break;
-            case db_1.DBType.Redis:
-                driver = new db_1.RedisDriver(conRes);
+            case types_1.DBType.AwsS3:
+            case types_1.DBType.Minio:
+                driver = new AwsS3Driver_1.AwsS3Driver(conRes);
                 break;
-            case db_1.DBType.AwsS3:
-            case db_1.DBType.Minio:
-                driver = new db_1.AwsS3Driver(conRes);
+            case types_1.DBType.AwsSQS:
+                driver = new AwsSQSDriver_1.AwsSQSDriver(conRes);
                 break;
             default:
                 throw new Error(`${conRes.dbType} is not supported.`);
         }
-        this.connectionList.push(conRes);
         this.driverMap.set(conRes.id, driver);
         return driver;
     }

package/built/src/drivers/DBDriverResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DBDriverResolver.js","sourceRoot":"","sources":["../../../src/drivers/DBDriverResolver.ts"],"names":[],"mappings":";;;;AAAA,8EAA4C;AAE5C,0CAA8D;AAC9D,oCAAkC;AAClC,+CAA4C;AAC5C,qDAAkD;AAClD,+CAA4C;AAC5C,+CAA4C;AAC5C,iDAA8C;AAE9C,MAAM,GAAG,GAAG,IAAI,yBAAa,EAAE,CAAC;AAEhC,MAAa,gBAAgB;IAK3B,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;SACxC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAGD;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAsB,CAAC;IACjD,CAAC;IAED,aAAa,CAAC,YAAoB;QAChC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CACb,+BAA+B,YAAY,cAAc,CAC1D,CAAC;SACH;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,YAAY,CAAuB,OAA0B;QAC3D,MAAM,MAAM,GAAG,IAAI,uBAAY,iCAC1B,OAAO,KACV,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IACrB,CAAC;QAEH,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,QAAQ,MAAM,CAAC,MAAM,EAAE;YAIrB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,QAAQ;gBAClB,MAAM,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;gBACpC,MAAM;YACR,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YAIR,KAAK,cAAM,CAAC,KAAK,CAAC;YAClB,KAAK,cAAM,CAAC,KAAK;gBACf,MAAM,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACR,KAAK,cAAM,CAAC,MAAM;gBAChB,MAAM,GAAG,IAAI,2BAAY,CAAC,MAAM,CAAC,CAAC;gBAClC,MAAM;YAOR;gBACE,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,MAAM,oBAAoB,CAAC,CAAC;SACzD;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IAEK,QAAQ;;YACZ,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAO,MAAkB,EAAE,EAAE;gBAClD,IAAI;oBACF,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;iBAC3B;gBAAC,OAAO,CAAC,EAAE;oBACV,YAAY,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;iBAClC;YACH,CAAC,CAAA,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;CACF;AArFD,4CAqFC"}

package/built/src/drivers/DBError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DBError.js","sourceRoot":"","sources":["../../../src/drivers/DBError.ts"],"names":[],"mappings":";;;AAAA,MAAa,OAAQ,SAAQ,KAAK;IAMhC,YACE,OAAY,EACZ,IAAS,EACT,KAAU,EACV,UAAe,EACf,QAAa;QAEb,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,OAAO,KAAK,CAAC,iBAAiB,KAAK,UAAU,EAAE;YACjD,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;SACjD;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;SACvC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAzBD,0BAyBC"}

package/built/src/{db/drivers → drivers}/MySQLDriver.d.ts

@@ -1,5 +1,5 @@
 import { BaseDriver, RequestSqlOptions } from './BaseDriver';
-import { ResultSetDataHolder, RdhKey, DbConnection, DbDatabase, DbSchema, DbTable, DbColumn, ColumnResolver, TableRows, SchemaAndTableHints } from '../resource';
+import { ColumnResolver, DbColumn, DbConnection, DbDatabase, DbSchema, DbTable, RdhKey, ResultSetDataHolder, SchemaAndTableHints, TableRows } from '../resource';
 export declare class MySQLDriver extends BaseDriver {
     private client;
     constructor(conRes: DbConnection);

package/built/src/{db/drivers → drivers}/MySQLDriver.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQLDriver = void 0;
 const tslib_1 = require("tslib");
-const BaseDriver_1 = require("./BaseDriver");
 const mysql = tslib_1.__importStar(require("mysql2/promise"));
-const resource_1 = require("../resource");
 const enum_values_1 = require("enum-values");
+const MySQLColumnType_1 = require("../types/MySQLColumnType");
+const BaseDriver_1 = require("./BaseDriver");
+const resource_1 = require("../resource");
+const types_1 = require("../types");
 class MySQLDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -14,9 +16,9 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
         if (resolver) {
             resolver.hints.list.push({ table: fieldInfo.orgTable });
         }
-        const name = enum_values_1.EnumValues.getNameFromValue(resource_1.MySQLColumnType, resource_1.MySQLColumnType.parseByFieldInfo(fieldInfo));
-        const key = new resource_1.RdhKey(fieldInfo.name, resource_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.orgName, resolver));
-        if (key.type === resource_1.GeneralColumnType.UNKNOWN) {
+        const name = enum_values_1.EnumValues.getNameFromValue(MySQLColumnType_1.MySQLColumnType, MySQLColumnType_1.MySQLColumnType.parseByFieldInfo(fieldInfo));
+        const key = new resource_1.RdhKey(fieldInfo.name, types_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.orgName, resolver));
+        if (key.type === types_1.GeneralColumnType.UNKNOWN) {
         }
         return key;
     }
@@ -228,8 +230,8 @@ class MySQLDriver extends BaseDriver_1.BaseDriver {
             FROM INFORMATION_SCHEMA.COLUMNS
             WHERE TABLE_SCHEMA = ? AND  TABLE_NAME = ?`, { binds });
             return rdh.rows.map((r) => {
-                const type_name = enum_values_1.EnumValues.getNameFromValue(resource_1.MySQLColumnType, resource_1.MySQLColumnType.parse(r.values.col_type));
-                const res = new resource_1.DbColumn(r.values.name, resource_1.GeneralColumnType.parse(type_name), {
+                const type_name = enum_values_1.EnumValues.getNameFromValue(MySQLColumnType_1.MySQLColumnType, MySQLColumnType_1.MySQLColumnType.parse(r.values.col_type));
+                const res = new resource_1.DbColumn(r.values.name, types_1.GeneralColumnType.parse(type_name), {
                     nullable: r.values.nullable === 1,
                     key: r.values.col_key,
                     default: r.values.col_default,

package/built/src/drivers/MySQLDriver.js.map

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

package/built/src/{db/drivers → drivers}/PostgresDriver.d.ts

@@ -1,6 +1,6 @@
-import { BaseDriver, RequestSqlOptions } from './BaseDriver';
-import { ResultSetDataHolder, RdhKey, DbConnection, DbDatabase, DbSchema, DbTable, DbColumn, ColumnResolver, TableRows, SchemaAndTableHints } from '../resource';
 import { default as pg } from 'pg';
+import { BaseDriver, RequestSqlOptions } from './BaseDriver';
+import { ColumnResolver, DbColumn, DbConnection, DbDatabase, DbSchema, DbTable, RdhKey, ResultSetDataHolder, SchemaAndTableHints, TableRows } from '../resource';
 export declare class PostgresDriver extends BaseDriver {
     private pool;
     constructor(conRes: DbConnection);

package/built/src/{db/drivers → drivers}/PostgresDriver.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresDriver = void 0;
 const tslib_1 = require("tslib");
-const BaseDriver_1 = require("./BaseDriver");
-const resource_1 = require("../resource");
 const pg_1 = tslib_1.__importDefault(require("pg"));
 const enum_values_1 = require("enum-values");
+const PostgresColumnType_1 = require("../types/PostgresColumnType");
+const BaseDriver_1 = require("./BaseDriver");
+const resource_1 = require("../resource");
+const types_1 = require("../types");
 class PostgresDriver extends BaseDriver_1.BaseDriver {
     constructor(conRes) {
         super(conRes);
@@ -14,8 +16,8 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
         if (fieldInfo.name.startsWith('c_')) {
             console.log(`★ ${fieldInfo.name.substring(2).toUpperCase()} = ${fieldInfo.dataTypeID}`);
         }
-        const name = enum_values_1.EnumValues.getNameFromValue(resource_1.PostgresColumnType, resource_1.PostgresColumnType.parse(fieldInfo.dataTypeID));
-        const key = new resource_1.RdhKey(fieldInfo.name, resource_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.name, resolver));
+        const name = enum_values_1.EnumValues.getNameFromValue(PostgresColumnType_1.PostgresColumnType, PostgresColumnType_1.PostgresColumnType.parse(fieldInfo.dataTypeID));
+        const key = new resource_1.RdhKey(fieldInfo.name, types_1.GeneralColumnType.parse(name), super.resolveColumnComment(fieldInfo.name, resolver));
         return key;
     }
     connectSub() {
@@ -255,8 +257,8 @@ class PostgresDriver extends BaseDriver_1.BaseDriver {
     order by
       col.ordinal_position`, { binds });
             return rdh.rows.map((r) => {
-                const type_name = enum_values_1.EnumValues.getNameFromValue(resource_1.PostgresColumnType, resource_1.PostgresColumnType.parse(r.values.col_type));
-                const res = new resource_1.DbColumn(r.values.qname, resource_1.GeneralColumnType.parse(type_name), {
+                const type_name = enum_values_1.EnumValues.getNameFromValue(PostgresColumnType_1.PostgresColumnType, PostgresColumnType_1.PostgresColumnType.parse(r.values.col_type));
+                const res = new resource_1.DbColumn(r.values.qname, types_1.GeneralColumnType.parse(type_name), {
                     nullable: r.values.nullable === 1,
                     key: r.values.col_key,
                     default: r.values.col_default,