sedentary-pg 0.0.39 → 0.0.40

package/dist/cjs/pgdb.js

@@ -86,15 +86,16 @@ class PGDB extends sedentary_1.DB {
     }
     load(tableName, attributes, pk, model, table) {
         const pkFldName = pk.fieldName;
-        return async (where, order, tx, lock) => {
+        return async (where, order, limit, tx, lock) => {
             const { oid } = table;
             const ret = [];
             const client = tx ? tx._client : await this.pool.connect();
             const oidPK = {};
             try {
                 const forUpdate = lock ? " FOR UPDATE" : "";
-                const orderBy = order && order.length ? ` ORDER BY ${order.map(_ => (_.startsWith("-") ? `${_.substring(1)} DESC` : _)).join(",")}` : "";
-                const query = `SELECT *, tableoid FROM ${tableName}${where ? ` WHERE ${where}` : ""}${orderBy}${forUpdate}`;
+                const orderBy = order && order.length ? ` ORDER BY ${(typeof order === "string" ? [order] : order).map(_ => (_.startsWith("-") ? `${_.substring(1)} DESC` : _)).join(",")}` : "";
+                const limitTo = typeof limit === "number" ? ` LIMIT ${limit}` : "";
+                const query = `SELECT *, tableoid FROM ${tableName}${where ? ` WHERE ${where}` : ""}${orderBy}${limitTo}${forUpdate}`;
                 this.log(query);
                 const res = await client.query(query);
                 for (const row of res.rows) {

package/dist/es/pgdb.js

@@ -81,15 +81,16 @@ export class PGDB extends DB {
     }
     load(tableName, attributes, pk, model, table) {
         const pkFldName = pk.fieldName;
-        return async (where, order, tx, lock) => {
+        return async (where, order, limit, tx, lock) => {
             const { oid } = table;
             const ret = [];
             const client = tx ? tx._client : await this.pool.connect();
             const oidPK = {};
             try {
                 const forUpdate = lock ? " FOR UPDATE" : "";
-                const orderBy = order && order.length ? ` ORDER BY ${order.map(_ => (_.startsWith("-") ? `${_.substring(1)} DESC` : _)).join(",")}` : "";
-                const query = `SELECT *, tableoid FROM ${tableName}${where ? ` WHERE ${where}` : ""}${orderBy}${forUpdate}`;
+                const orderBy = order && order.length ? ` ORDER BY ${(typeof order === "string" ? [order] : order).map(_ => (_.startsWith("-") ? `${_.substring(1)} DESC` : _)).join(",")}` : "";
+                const limitTo = typeof limit === "number" ? ` LIMIT ${limit}` : "";
+                const query = `SELECT *, tableoid FROM ${tableName}${where ? ` WHERE ${where}` : ""}${orderBy}${limitTo}${forUpdate}`;
                 this.log(query);
                 const res = await client.query(query);
                 for (const row of res.rows) {

package/dist/types/pgdb.d.ts

@@ -15,7 +15,7 @@ export declare class PGDB extends DB<TransactionPG> {
     client(): Promise<PoolClient>;
     escape(value: Natural): string;
     fill(attributes: Record<string, string>, row: Record<string, Natural>, entry: Record<string, Natural>): void;
-    load(tableName: string, attributes: Record<string, string>, pk: Attribute<Natural, unknown>, model: new (from: "load") => EntryBase, table: Table): (where: string, order?: string[], tx?: Transaction) => Promise<EntryBase[]>;
+    load(tableName: string, attributes: Record<string, string>, pk: Attribute<Natural, unknown>, model: new (from: "load") => EntryBase, table: Table): (where: string, order?: string | string[], limit?: number, tx?: Transaction) => Promise<EntryBase[]>;
     remove(tableName: string, pk: Attribute<Natural, unknown>): (this: Record<string, Natural> & {
         tx?: TransactionPG;
     }) => Promise<boolean>;

package/jest.config.js

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+module.exports = {
+  collectCoverageFrom:    ["index.ts", "pgdb.ts"],
+  preset:                 "ts-jest",
+  testEnvironment:        "jest-environment-node-single-context",
+  testPathIgnorePatterns: ["/node_modules/"],
+  testSequencer:          "../testSequencer.js"
+};

package/package.json

@@ -9,20 +9,21 @@
     "@types/pg": "8.6.5",
     "pg": "8.7.3",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.39"
+    "sedentary": "0.0.40"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
-    "@types/mocha": "9.1.1",
+    "@types/jest": "28.1.3",
     "@types/node": "18.0.0",
     "@types/pg-format": "1.0.2",
     "@types/yamljs": "0.2.31",
     "@typescript-eslint/eslint-plugin": "5.30.0",
     "@typescript-eslint/parser": "5.30.0",
     "eslint": "8.18.0",
-    "mocha": "10.0.0",
-    "nyc": "15.1.0",
+    "jest": "28.1.1",
+    "jest-environment-node-single-context": "28.0.0",
     "prettier": "2.7.1",
+    "ts-jest": "28.0.5",
     "ts-node": "10.8.1",
     "typescript": "4.7.4",
     "yamljs": "0.3.0"
@@ -58,11 +59,11 @@
   "readmeFilename": "README.md",
   "repository": "https://github.com/iccicci/sedentary-pg",
   "scripts": {
-    "coverage": "nyc -r lcov -r text -r text-summary -r html mocha -r ts-node/register test/*ts",
+    "coverage": "jest --coverage  --runInBand",
     "gitignore": "node -r ts-node/register utils.ts gitignore",
     "npmignore": "node -r ts-node/register utils.ts npmignore",
     "packagejson": "node -r ts-node/register utils.ts packagejson",
-    "test": "mocha -r ts-node/register test/*ts",
+    "test": "jest --runInBand --verbose",
     "travis": "node -r ts-node/register utils.ts travis",
     "tsc": "tsc -p tsconfig.cjs.json && tsc -p tsconfig.es.json && tsc -p tsconfig.types.json",
     "version": "node -r ts-node/register utils.ts version"
@@ -84,5 +85,5 @@
     }
   },
   "types": "./dist/types/index.d.ts",
-  "version": "0.0.39"
+  "version": "0.0.40"
 }