@newbility/database - npm Package Compare versions

Comparing version 0.2.18 to 0.2.19

build/src/DatabaseClient.d.ts

@@ -32,3 +32,6 @@ import { IDisposable, ILogger } from '@newbility/core';
         [key: string]: any;
-    }): Promise<ExecuteResult<TResult>>;
+    }): Promise<{
+        totalCount: number;
+        data: TResult[];
+    }>;
     /**
@@ -50,3 +53,6 @@ * 查询第一个
         [key: string]: any;
-    }): Promise<ExecuteResult<TResult>>;
+    }): Promise<{
+        totalCount: number;
+        data: TResult[];
+    }>;
     QueryOneAsync<TResult = any>(sql: string, ...args: any[]): Promise<TResult | undefined>;
@@ -53,0 +59,0 @@ abstract Dispose(): void;

build/src/DatabaseClient.js

@@ -21,2 +21,6 @@ "use strict";
             pageQuerySql = pageQuerySql.replace(/;$/, '');
+        const totalSql = `
+      SELECT count(*) from (${pageQuerySql}) as tmp;    
+    `;
+        const totalCountResult = await this.QueryOneAsync(totalSql);
         const sqlParams = args[0];
@@ -29,3 +33,7 @@ if (sqlParams.limit !== undefined && sqlParams.limit !== null) {
         }
-        return await this.ExecuteByObjArgsAsync(pageQuerySql, args);
+        const result = await this.ExecuteByObjArgsAsync(pageQuerySql, args);
+        return {
+            totalCount: totalCountResult?.count ?? 0,
+            data: result.rows,
+        };
     }
@@ -32,0 +40,0 @@ async QueryOneAsync(sql, ...args) {

build/src/DatabaseClient.js.map

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

package.json

 {
   "name": "@newbility/database",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "main": "build/index.js",
@@ -19,3 +19,3 @@ "author": "jameshu",
   "dependencies": {
-    "@newbility/core": "^0.2.18"
+    "@newbility/core": "^0.2.19"
   },
@@ -22,0 +22,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

22931

2.6%

Lines of code

345

4.23%

Dependency changes

• Updated

  @newbility/core@^0.2.19