baja-lite 1.0.4 → 1.0.5

package/src/sqlite.ts

@@ -0,0 +1,161 @@
+import {  SqliteRemoteInterface, logger } from './sql';
+import Sqlstring from 'sqlstring';
+export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
+    private dbList: Record<string, any> = {};
+    /** 原始存放路径 */
+    abstract getStoreName(dbName: string): string;
+    /** 导入时，备份源文件路径 */
+    abstract getBackName(dbName: string): string;
+    /** 实现导出时选择文件路径方法  */
+    abstract getExportPath(): Promise<string | undefined | null>;
+    /** 实现入时选择文件路径方法  */
+    abstract getImportPath(): Promise<string | undefined | null>;
+    /** 实现复制 */
+    abstract cpSync(from: string, to: string, option?: { force: true }): void;
+    /**
+     * 设置可执行权限
+     ```
+        const fd = openSync(dbPath, 1);
+        fchmodSync(fd, 777);
+        closeSync(fd);
+     ```
+     */
+    abstract setMod(name: string): void;
+    abstract trace: boolean;
+    async execute(dbName: string, sql?: string | undefined, params?: any): Promise<{ affectedRows: number; insertId: bigint; }> {
+        try {
+            logger.debug(sql, params ?? '');
+            if (!sql) { return { affectedRows: 0, insertId: 0n }; };
+            if (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            const result = this.dbList[dbName].prepare(sql).run(params ?? {});
+            if (this.trace) {
+                logger.trace(result);
+            }
+            const { changes, lastInsertRowid } = result;
+            return { affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n };
+        } catch (error) {
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
+            `);
+            throw error;
+        }
+    }
+    async pluck<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null> {
+        try {
+            logger.debug(sql, params ?? '');
+            if (!sql) { return null };
+            if (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return this.dbList[dbName].prepare(sql).pluck().get(params ?? {});
+        } catch (error) {
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
+            `);
+            throw error;
+        }
+    }
+    async get<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null> {
+        try {
+            logger.debug(sql, params ?? '');
+            if (!sql) { return null };
+            if (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return this.dbList[dbName].prepare(sql).get(params ?? {});
+        } catch (error) {
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
+            `);
+            throw error;
+        }
+    }
+    async raw<Many_Row_One_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_One_Column[]> {
+        try {
+            logger.debug(sql, params ?? '');
+            if (!sql) { return []; };
+            if (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return this.dbList[dbName].prepare(sql).raw().all(params ?? {});
+        } catch (error) {
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
+            `);
+            throw error;
+        }
+    }
+    async query<Many_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_Many_Column[]> {
+        try {
+            logger.debug(sql, params ?? '');
+            if (!sql) { return []; };
+            if (this.trace) {
+                logger.trace(Sqlstring.format(sql!, params));
+            }
+            return this.dbList[dbName].prepare(sql).all(params ?? {});
+        } catch (error) {
+            logger.error(`
+                error: ${error},
+                sql: ${sql},
+                params: ${params}
+            `);
+            throw error;
+        }
+    }
+    async initDB(dbName: string): Promise<void> {
+        if (!this.dbList[dbName]) {
+            const BetterSqlite3 = await import('better-sqlite3');
+            this.dbList[dbName] = new BetterSqlite3.default(this.getStoreName(dbName), { fileMustExist: false });
+            this.dbList[dbName].pragma('journal_mode = WAL');
+            this.dbList[dbName].exec(`
+                CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
+                DELETE FROM DUAL;
+                INSERT INTO DUAL (______id ) VALUES ( 1 );
+                CREATE TABLE IF NOT EXISTS TABLE_VERSION (
+                ______tableName text NOT NULL,
+                ______version text NOT NULL,
+                PRIMARY KEY ( ______tableName )
+                );
+            `);
+        }
+    }
+    async export(dbName: string): Promise<void> {
+        const exportPath = await this.getExportPath();
+        if (exportPath) {
+            await this.dbList[dbName].backup(exportPath);
+        }
+    }
+    async restore(dbName: string): Promise<void> {
+        const importPath = await this.getImportPath();
+        if (importPath) {
+            if (this.dbList[dbName]) {
+                this.dbList[dbName].close();
+                this.dbList[dbName] = null;
+            }
+            const nn = this.getStoreName(dbName);
+            this.cpSync(nn, this.getBackName(dbName));
+            this.cpSync(importPath, nn, { force: true });
+            this.setMod(nn);
+            this.initDB(dbName);
+        }
+    }
+    close(dbName?: string) {
+        if (dbName) {
+            this.dbList[dbName]?.close();
+        } else {
+            for (const db of Object.values(this.dbList)) {
+                db.close();
+            }
+        }
+    }
+}

package/src/test-mysql.ts

@@ -1,16 +1,18 @@
-import { SqlService, Boot, Field, DB, DBType, DeleteMode, SqlType, InsertMode, TemplateResult, SelectResult } from './sql';
+import 'reflect-metadata';
+import { Boot } from './boot';
+import { SqlService, Field, DB, DBType,  SqlType,  ColumnMode,  } from './sql';
 
 class AmaFuck2 {
-    @Field({ type: SqlType.varchar, length: 200 })
+    @Field({ type: SqlType.varchar, length: 200,  id: true, uuid: true })
     site?: string;
-    @Field({ type: SqlType.varchar, length: 200 })
-    SellerSKU2?: string;
-    @Field({ type: SqlType.varchar, id: true, length: 200 })
-    SellerSKU?: string;
+    @Field({ type: SqlType.varchar, length: 200,def:'333' })
+    sellerSku2?: string;
+    @Field({ type: SqlType.varchar,  length: 200 })
+    sellerSku?: string;
 }
 
 @DB({
-    tableName: 'ama_fuck2', clz: AmaFuck2, dbType: DBType.Mysql
+    tableName: 'ama_fuck', clz: AmaFuck2, dbType: DBType.Mysql
 })
 class AmaService2 extends SqlService<AmaFuck2>{
 
@@ -26,70 +28,77 @@ async function go2() {
             database: 'dmce',
             debug: false
         },
-        log: 'info'
+        log: 'trace',
+        columnMode: ColumnMode.HUMP,
+        sqlDir: 'E:/pro/baja-lite/xml'
     });
     const service = new AmaService2();
-    const ret = await service.transaction<number>({
+    await service.transaction<number>({
         fn: async conn => {
-            const list = new Array<AmaFuck2>({
-                SellerSKU: 'SellerSKU1',
-                site: 'site1'
-            }, {
-                SellerSKU: 'SellerSKU2',
-                SellerSKU2: 'SellerSKU22',
-            }, {
-                SellerSKU2: 'SellerSKU23',
-                SellerSKU: 'SellerSKU3',
-                site: 'site3'
-            }, {
-                SellerSKU2: 'SellerSKU24',
-                SellerSKU: 'SellerSKU4',
-                site: 'site4'
-            }, {
-                SellerSKU2: '',
-                SellerSKU: 'SellerSKU5',
-                site: undefined
-            });
-            const rt = await service.insert({
-                data: list,
-                conn, skipEmptyString: false,
-                mode: InsertMode.InsertWithTempTable
-            });
-            console.log(11, rt);
-            const rt2 = await service.update({
-                data: {
-                    SellerSKU: 'SellerSKU1',
-                    SellerSKU2: 'SellerSKU21',
-                    site: 'site1'
-                },
-                conn, skipEmptyString: false
-            });
-            console.log(22, rt2);
-            const rt3 = await service.delete({
-                where: [
-                    { SellerSKU2: 'SellerSKU23', SellerSKU: 'SellerSKU3' }
-                ],
-                mode: DeleteMode.TempTable,
-                conn
-            });
-            console.log(33, rt3);
-            const rt4 = await service.template({
-                where: { SellerSKU2: 'SellerSKU22', SellerSKU: 'SellerSKU2' },
-                templateResult: TemplateResult.Count
-            })
-            console.log(44, rt4);
+            // const list = new Array<AmaFuck2>({
+            //     sellerSku: 'SellerSKU1',
+            // }, {
+            //     sellerSku: 'sellerSku1',
+            //     sellerSku2: 'SellerSKU11',
+            // }, {
+            //     sellerSku2: 'SellerSKU2',
+            //     sellerSku: 'SellerSKU22',
+            // }, {
+            //     sellerSku2: 'SellerSKU3',
+            //     sellerSku: 'SellerSKU33',
+            // }, {
+            //     sellerSku2: '',
+            //     sellerSku: 'SellerSKU44',
+            //     site: '1234'
+            // });
+            // const rt = await service.insert({
+            //     data: list,
+            //     conn,
+            //     // skipEmptyString: false,
+            //     // skipUndefined: false
+            //     mode: InsertMode.InsertWithTempTable,
+            //     existConditionOtherThanIds: ['sellerSku']
+            // });
+            // console.log(11, rt);
+            // const rt2 = await service.update({
+            //     data: {
+            //         sellerSku: 'SellerSKU1',
+            //         sellerSku2: 'SellerSKU21',
+            //         site: 'site1'
+            //     },
+            //     conn, skipEmptyString: false
+            // });
+            // console.log(22, rt2);
+            // const rt3 = await service.delete({
+            //     where: [
+            //         { sellerSku2: 'SellerSKU23', sellerSku: 'SellerSKU3' }
+            //     ],
+            //     mode: DeleteMode.TempTable,
+            //     conn
+            // });
+            // console.log(33, rt3);
+            // const rt4 = await service.template({
+            //     where: { sellerSku2: 'SellerSKU22', sellerSku: 'sellerSku2' },
+            //     templateResult: TemplateResult.Many
+            // })
+            // console.log(44, rt4);
 
-            const rt5 = await service.select<string>({
-                sql: `SELECT SellerSKU FROM ama_fuck2 WHERE SellerSKU LIKE CONCAT(:sku, '%');SELECT SellerSKU FROM ama_fuck2 WHERE SellerSKU LIKE CONCAT(:sku, '%');SELECT SellerSKU FROM ama_fuck2 WHERE SellerSKU LIKE CONCAT(:sku, '%')`,
-                params: {sku: 'SellerSKU4'},
-                selectResult: SelectResult.Many_Row_One_Column
-            })
-            console.log(55, rt5);
+            // const rt5 = await service.select<string>({
+            //     sql: `SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%');SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%');SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%')`,
+            //     params: { sku: 'SellerSKU4' },
+            //     selectResult: SelectResult.Many_Row_One_Column,
+            //     multiple: true
+            // })
+            // console.log(55, rt5);
+            // const rt6 = await service.stream().eq('sellerSku', 'SellerSKU1').excuteSelect({
+            //     selectResult: SelectResult.Many_Row_Many_Column,
+            // });
+            // console.log(66, rt6);
 
             return 1;
         }
     });
-    return ret;
+    await service.select({sqlId: 'event-report.matchSectionTempWGoalPlayerList',params: {searchVo:{matchId:'yyyy',matchSection:'oooo'}}});
 }
 
 

package/src/test-sqlite.ts

@@ -1,4 +1,6 @@
-import { SqlService, Boot, Field, SqlType, DB, DBType, SyncMode, DeleteMode, InsertMode } from './sql';
+import 'reflect-metadata';
+import { Boot } from './boot';
+import { SqlService,  Field, SqlType, DB, DBType, SyncMode, DeleteMode, InsertMode } from './sql';
 
 class AmaFuck {
     @Field({ type: SqlType.varchar })

package/src/test-xml.ts

@@ -0,0 +1,70 @@
+import HTML from 'html-parse-stringify';
+console.log((HTML.parse(`
+    <sql id="reportField">
+            a.left_e_foul leftEFoul,
+            a.right_e_foul rightEFoul,
+            a.left_em_foul leftEmFoul,
+            a.right_em_foul rightEmFoul,
+            a.left_s_foul leftSFoul,
+            a.right_s_foul rightSFoul,
+            a.left_sb_foul leftSbFoul,
+            a.right_sb_foul rightSbFoul,
+            a.left_p_foul leftPFoul,
+            a.right_p_foul rightPFoul,
+            a.left_attack_goal leftAttackGoal,
+            a.right_attack_goal rightAttackGoal,
+            a.left_point_goal leftPointGoal,
+            a.right_point_goal rightPointGoal,
+            a.left_over_time_goal leftOverTimeGoal,
+            a.right_over_time_goal rightOverTimeGoal,
+            a.left_normal_goal leftNormalGoal,
+            a.right_normal_goal rightNormalGoal,
+            a.left_own_goal leftOwnGoal,
+            a.right_own_goal rightOwnGoal,
+            a.left_time_out leftTimeOut,
+            a.right_time_out rightTimeOut,
+            a.left_coach_y_card leftCoachYCard,
+            a.right_coach_y_card rightCoachYCard,
+            a.left_player_r_card leftPlayerRCard,
+            a.right_player_r_card rightPlayerRCard,
+            a.left_jump_ball leftJumpBall,
+            a.right_jump_ball rightJumpBall
+    </sql>
+    <select id="matchReport" resultType="org.jeecg.modules.event.entity.EventMatchReport">
+        select
+        b.event_name eventName,
+        a.match_id matchId,
+        a.event_times eventTimes,
+        a.team_left_id teamLeftId,
+        a.team_RIGHt_id teamRightId,
+        a.team_left_name teamLeftName,
+        a.team_right_name teamRightName,
+        a.team_left_image teamLeftImage,
+        a.team_right_image teamRightImage,
+        <include refid="reportField" />
+        <if test="matchInfo.reportType!=null and matchInfo.reportType!=''">
+            from view_match_report a
+        </if>
+        <if test="matchInfo.reportType==null or matchInfo.reportType==''">
+            from event_match_report a
+        </if>
+        left join event_main_info b on a.event_id = b.id
+        <where>
+            <if test="matchInfo.id!=null and matchInfo.id!=''">
+                and a.match_id = #{matchInfo.id}
+            </if>
+            <if test="matchInfo.eventId!=null and matchInfo.eventId!=''">
+                and a.event_id = #{matchInfo.eventId}
+            </if>
+            <if test="matchInfo.teamLeftId!=null and matchInfo.teamLeftId!=''">
+                and (a.team_left_id = #{matchInfo.teamLeftId} OR a.team_right_id = #{matchInfo.teamLeftId})
+            </if>
+            <if test="dataIdList!=null">
+                and a.event_id in
+                <foreach collection="dataIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+>`)));

package/cjs/constant.d.ts

@@ -1,13 +0,0 @@
-/** 执行方式 */
-export declare enum SqlSyncMode {
-    /** 同步执行 */
-    Sync = 0,
-    /** 异步执行 */
-    Async = 1
-}
-export declare enum ExcuteSplitMode {
-    SyncTrust = 0,
-    SyncNoTrust = 1,
-    AsyncTrust = 2,
-    AsyncNoTrust = 3
-}

package/cjs/constant.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExcuteSplitMode = exports.SqlSyncMode = void 0;
-/** 执行方式 */
-var SqlSyncMode;
-(function (SqlSyncMode) {
-    /** 同步执行 */
-    SqlSyncMode[SqlSyncMode["Sync"] = 0] = "Sync";
-    /** 异步执行 */
-    SqlSyncMode[SqlSyncMode["Async"] = 1] = "Async";
-})(SqlSyncMode || (exports.SqlSyncMode = SqlSyncMode = {}));
-;
-var ExcuteSplitMode;
-(function (ExcuteSplitMode) {
-    ExcuteSplitMode[ExcuteSplitMode["SyncTrust"] = 0] = "SyncTrust";
-    ExcuteSplitMode[ExcuteSplitMode["SyncNoTrust"] = 1] = "SyncNoTrust";
-    ExcuteSplitMode[ExcuteSplitMode["AsyncTrust"] = 2] = "AsyncTrust";
-    ExcuteSplitMode[ExcuteSplitMode["AsyncNoTrust"] = 3] = "AsyncNoTrust";
-})(ExcuteSplitMode || (exports.ExcuteSplitMode = ExcuteSplitMode = {}));

package/cjs/redis.js

@@ -1 +0,0 @@
-"use strict";

package/es/constant.d.ts

@@ -1,13 +0,0 @@
-/** 执行方式 */
-export declare enum SqlSyncMode {
-    /** 同步执行 */
-    Sync = 0,
-    /** 异步执行 */
-    Async = 1
-}
-export declare enum ExcuteSplitMode {
-    SyncTrust = 0,
-    SyncNoTrust = 1,
-    AsyncTrust = 2,
-    AsyncNoTrust = 3
-}

package/es/constant.js

@@ -1,16 +0,0 @@
-/** 执行方式 */
-export var SqlSyncMode;
-(function (SqlSyncMode) {
-    /** 同步执行 */
-    SqlSyncMode[SqlSyncMode["Sync"] = 0] = "Sync";
-    /** 异步执行 */
-    SqlSyncMode[SqlSyncMode["Async"] = 1] = "Async";
-})(SqlSyncMode || (SqlSyncMode = {}));
-;
-export var ExcuteSplitMode;
-(function (ExcuteSplitMode) {
-    ExcuteSplitMode[ExcuteSplitMode["SyncTrust"] = 0] = "SyncTrust";
-    ExcuteSplitMode[ExcuteSplitMode["SyncNoTrust"] = 1] = "SyncNoTrust";
-    ExcuteSplitMode[ExcuteSplitMode["AsyncTrust"] = 2] = "AsyncTrust";
-    ExcuteSplitMode[ExcuteSplitMode["AsyncNoTrust"] = 3] = "AsyncNoTrust";
-})(ExcuteSplitMode || (ExcuteSplitMode = {}));

package/es/redis.js

@@ -1 +0,0 @@
-"use strict";

package/src/constant.ts

@@ -1,14 +0,0 @@
-/** 执行方式 */
-export enum SqlSyncMode {
-    /** 同步执行 */
-    Sync,
-    /** 异步执行 */
-    Async
-};
-
-export enum ExcuteSplitMode {
-    SyncTrust,
-    SyncNoTrust,
-    AsyncTrust,
-    AsyncNoTrust,
-}