baja-lite 1.0.6 → 1.0.10

package/src/sqlite.ts

@@ -1,5 +1,6 @@
-import {  SqliteRemoteInterface, logger } from './sql';
+import { SqliteRemoteInterface, logger } from './sql';
 import Sqlstring from 'sqlstring';
+import { encode, decode } from "@msgpack/msgpack";
 export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
     private dbList: Record<string, any> = {};
     /** 原始存放路径 */
@@ -22,10 +23,11 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
      */
     abstract setMod(name: string): void;
     abstract trace: boolean;
-    async execute(dbName: string, sql?: string | undefined, params?: any): Promise<{ affectedRows: number; insertId: bigint; }> {
+    async execute(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
-            if (!sql) { return { affectedRows: 0, insertId: 0n }; };
+            if (!sql) { return encode({ affectedRows: 0, insertId: 0n }); };
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
@@ -34,7 +36,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
                 logger.trace(result);
             }
             const { changes, lastInsertRowid } = result;
-            return { affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n };
+            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n });
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -44,14 +46,16 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async pluck<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null> {
+    async pluck(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
+        logger.debug(sql, params ?? '');
         try {
             logger.debug(sql, params ?? '');
-            if (!sql) { return null };
+            if (!sql) { return encode(null) };
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return this.dbList[dbName].prepare(sql).pluck().get(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}));
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -61,14 +65,14 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async get<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null> {
+    async get(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
+        logger.debug(sql, params ?? '');
         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 ?? {});
+            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}));
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -78,14 +82,15 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async raw<Many_Row_One_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_One_Column[]> {
+    async raw(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
-            if (!sql) { return []; };
+            if (!sql) { return encode([]); };
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return this.dbList[dbName].prepare(sql).raw().all(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}));
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -95,14 +100,15 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async query<Many_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_Many_Column[]> {
+    async query(inData: Uint8Array): Promise<Uint8Array> {
+        const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
+        logger.debug(sql, params ?? '');
         try {
-            logger.debug(sql, params ?? '');
-            if (!sql) { return []; };
+            if (!sql) { encode([]); };
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return this.dbList[dbName].prepare(sql).all(params ?? {});
+            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}));
         } catch (error) {
             logger.error(`
                 error: ${error},

package/src/test-mysql.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { Boot } from './boot';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, } from './sql';
+import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql';
 class AmaFuck2 {
     @Field({ type: SqlType.varchar, length: 200, id: true, uuid: true })
     site?: string;
@@ -17,12 +17,12 @@ class AmaService2 extends SqlService<AmaFuck2>{
 
 }
 
-interface Menu {
-    resourceid: string;
-    resourcepid: string;
-    resourcename: string;
-    children: Menu[];
-}
+// interface Menu {
+//     resourceid: string;
+//     resourcepid: string;
+//     resourcename: string;
+//     children: Menu[];
+// }
 
 export async function go2() {
     await Boot({
@@ -37,7 +37,10 @@ export async function go2() {
         },
         log: 'info',
         columnMode: ColumnMode.HUMP,
-        sqlDir: 'E:/pro/baja-lite/xml'
+        sqlDir: 'E:/pro/baja-lite/xml',
+        sqlMap: {
+            ['test.test']: `SELECT * FROM cp_user {{#username}} WHERE username = :username {{/username}}`
+        }
     });
     const service = new AmaService2();
     await service.transaction<number>({
@@ -90,13 +93,12 @@ export async function go2() {
             // })
             // console.log(44, rt4);
 
-            // 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 rt5 = await service.select<{username:string}>({
+                sqlId: 'test.test',
+                params: { username: '1111' },
+                selectResult: SelectResult.RS_CS
+            })
+            console.log(55, rt5.length);
             // const rt6 = await service.stream().eq('sellerSku', 'SellerSKU1').excuteSelect({
             //     selectResult: SelectResult.Many_Row_Many_Column,
             // });
@@ -106,19 +108,19 @@ export async function go2() {
         }
     });
 
-    const data = await service.select<Menu>({
-        sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
-        params: {
-            site: '1234',
-            matchInfo: { reportType: 'yyyy', id: '11' }
-        },
-        // mapper: [
-        //     ['site', ['info', 'bSist'], 989],
-        //     ['site', ['info2', 'bSist'], 33],
-        //     ['site', ['Bsite'], 0]
-        // ]
-    });
-    console.log(data);
+    // const data = await service.select<Menu>({
+    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
+    //     params: {
+    //         site: '1234',
+    //         matchInfo: { reportType: 'yyyy', id: '11' }
+    //     },
+    //     // mapper: [
+    //     //     ['site', ['info', 'bSist'], 989],
+    //     //     ['site', ['info2', 'bSist'], 33],
+    //     //     ['site', ['Bsite'], 0]
+    //     // ]
+    // });
+    // console.log(data);
 
 }
 go2();