query-core 0.1.31 → 0.2.0

package/lib/query.js

@@ -14,7 +14,7 @@ function buildSort(sort, map) {
         var field = st;
         var tp = st.charAt(0);
         if (tp === '-' || tp === '+') {
-          field = st.substr(1);
+          field = st.substring(1);
         }
         var sortType = (tp === '-' ? ' desc' : '');
         sort2.push(getField(field.trim(), map) + sortType);

package/lib/search.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function buildFromQuery(query, sql, params, limit, offset, mp, bools, provider, totalCol) {
+function getOffset(limit, page, ifirstPageSize) {
+  if (ifirstPageSize && ifirstPageSize > 0) {
+    var offset = limit * (page - 2) + ifirstPageSize;
+    return offset < 0 ? 0 : offset;
+  }
+  else {
+    var offset = limit * (page - 1);
+    return offset < 0 ? 0 : offset;
+  }
+}
+exports.getOffset = getOffset;
+function buildFromQuery(query, sql, params, limit, page, mp, bools, provider, totalCol) {
   if (!limit || limit <= 0) {
     return query(sql, params, mp, bools).then(function (list) {
       var total = (list ? list.length : undefined);
@@ -8,6 +19,8 @@ function buildFromQuery(query, sql, params, limit, offset, mp, bools, provider,
     });
   }
   else {
+    var ipage = (!page || page <= 0 ? 1 : page);
+    var offset = getOffset(limit, ipage);
     if (provider === exports.oracle) {
       if (!totalCol || totalCol.length === 0) {
         totalCol = 'total';
@@ -100,7 +113,7 @@ function buildPagingQueryForOracle(sql, limit, offset, total) {
     i = sql.indexOf(S);
   }
   if (i >= 0) {
-    return sql.substr(0, l) + " count(*) over() as " + total + ", " + sql.substr(l) + " offset " + offset + " rows fetch next " + limit + " rows only";
+    return sql.substring(0, l) + " count(*) over() as " + total + ", " + sql.substring(l) + " offset " + offset + " rows fetch next " + limit + " rows only";
   }
   else {
     return sql + " offset " + offset + " rows fetch next " + limit + " rows only";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-core",
-  "version": "0.1.31",
+  "version": "0.2.0",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/query.ts

@@ -15,7 +15,7 @@ export function buildSort(sort?: string, map?: Attributes|StringMap): string {
         let field = st;
         const tp = st.charAt(0);
         if (tp === '-' || tp === '+') {
-          field = st.substr(1);
+          field = st.substring(1);
         }
         const sortType = (tp === '-' ? ' desc' : '');
         sort2.push(getField(field.trim(), map) + sortType);

package/src/search.ts

@@ -4,13 +4,24 @@ export interface SearchResult<T> {
   list: T[];
   total?: number;
 }
-export function buildFromQuery<T>(query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<K[]>, sql: string, params?: any[], limit?: number, offset?: number, mp?: StringMap, bools?: Attribute[], provider?: string, totalCol?: string): Promise<SearchResult<T>> {
+export function getOffset(limit: number, page: number, ifirstPageSize?: number): number {
+  if (ifirstPageSize && ifirstPageSize > 0) {
+    const offset = limit * (page - 2) + ifirstPageSize;
+    return offset < 0 ? 0 : offset;
+  } else {
+    const offset = limit * (page - 1);
+    return offset < 0 ? 0 : offset;
+  }
+}
+export function buildFromQuery<T>(query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<K[]>, sql: string, params?: any[], limit?: number, page?: number, mp?: StringMap, bools?: Attribute[], provider?: string, totalCol?: string): Promise<SearchResult<T>> {
   if (!limit || limit <= 0) {
     return query<T>(sql, params, mp, bools).then(list => {
       const total = (list ? list.length : undefined);
       return {list, total};
     });
   } else {
+    const ipage = (!page || page <= 0 ? 1 : page)
+    const offset = getOffset(limit, ipage)
     if (provider === oracle) {
       if (!totalCol || totalCol.length === 0) {
         totalCol = 'total';
@@ -95,7 +106,7 @@ export function buildPagingQueryForOracle(sql: string, limit: number, offset?: n
     i = sql.indexOf(S);
   }
   if (i >= 0) {
-    return `${sql.substr(0, l)} count(*) over() as ${total}, ${sql.substr(l)} offset ${offset} rows fetch next ${limit} rows only`;
+    return `${sql.substring(0, l)} count(*) over() as ${total}, ${sql.substring(l)} offset ${offset} rows fetch next ${limit} rows only`;
   } else {
     return `${sql} offset ${offset} rows fetch next ${limit} rows only`;
   }