sedentary-pg 0.0.39 → 0.0.42

package/README.md

@@ -31,7 +31,7 @@
 
 # Description
 
-The **PostgreSQL** specilized package of [Sedentary](https://www.npmjs.com/package/sedentary).
+The **PostgreSQL** specialized package of [Sedentary](https://www.npmjs.com/package/sedentary).
 
 # Usage
 

package/dist/cjs/adsrc.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adsrc = void 0;
+// cspell: disable-next-line
 function adsrc(version) {
+    // cspell: disable-next-line
     return version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
 }
 exports.adsrc = adsrc;

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/adsrc.js

@@ -1,3 +1,5 @@
+// cspell: disable-next-line
 export function adsrc(version) {
+    // cspell: disable-next-line
     return version >= 12 ? "pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : "adsrc";
 }

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/package.json

@@ -1,6 +1,6 @@
 {
   "author": "Daniele Ricci <daniele.icc@gmail.com> (https://github.com/iccicci)",
-  "bugs": "https://github.com/iccicci/sedentary-pg/issues",
+  "bugs": "https://github.com/iccicci/sedentary/issues",
   "contributors": [
     "Daniele Ricci <daniele.icc@gmail.com> (https://github.com/iccicci)",
     "yossarian <sergiybiluk@gmail.com> (https://github.com/captain-yossarian)"
@@ -9,31 +9,16 @@
     "@types/pg": "8.6.5",
     "pg": "8.7.3",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.39"
+    "sedentary": "0.0.42"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
-  "devDependencies": {
-    "@types/mocha": "9.1.1",
-    "@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",
-    "prettier": "2.7.1",
-    "ts-node": "10.8.1",
-    "typescript": "4.7.4",
-    "yamljs": "0.3.0"
-  },
   "engines": {
     "node": ">=14.0"
   },
   "funding": {
     "url": "https://blockchain.info/address/1Md9WFAHrXTb3yPBwQWmUfv2RmzrtbHioB"
   },
-  "homepage": "https://github.com/iccicci/sedentary-pg#readme",
+  "homepage": "https://github.com/iccicci/sedentary/packages/sedentary-pg#readme",
   "keywords": [
     "DB",
     "ORM",
@@ -47,42 +32,20 @@
   "main": "./dist/cjs/index.js",
   "module": "./dist/es/index.js",
   "name": "sedentary-pg",
-  "prettier": {
-    "arrowParens": "avoid",
-    "endOfLine": "lf",
-    "jsxBracketSameLine": true,
-    "printWidth": 200,
-    "trailingComma": "none",
-    "useTabs": false
+  "optionalDependencies": {
+    "fsevents": "2.3.2"
   },
   "readmeFilename": "README.md",
-  "repository": "https://github.com/iccicci/sedentary-pg",
+  "repository": "https://github.com/iccicci/sedentary",
   "scripts": {
-    "coverage": "nyc -r lcov -r text -r text-summary -r html mocha -r ts-node/register test/*ts",
-    "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",
-    "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"
-  },
-  "tsd": {
-    "compilerOptions": {
-      "alwaysStrict": true,
-      "esModuleInterop": true,
-      "moduleResolution": "Node",
-      "noImplicitAny": true,
-      "noImplicitReturns": true,
-      "noImplicitThis": true,
-      "strict": true,
-      "strictBindCallApply": true,
-      "strictFunctionTypes": true,
-      "strictNullChecks": true,
-      "strictPropertyInitialization": true,
-      "target": "ESNext"
-    }
+    "build": "make build",
+    "coverage": "jest --coverage --runInBand",
+    "deploy": "npm_config_registry=\"registry.npmjs.org\" npm publish",
+    "precoverage": "make pretest",
+    "preinstall": "if [ -f Makefile ] ; then make ; fi",
+    "pretest": "make pretest",
+    "test": "jest --runInBand"
   },
   "types": "./dist/types/index.d.ts",
-  "version": "0.0.39"
+  "version": "0.0.42"
 }