sedentary-pg 0.0.11 → 0.0.12

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2020 Daniele Ricci
+Copyright (c) 2017 Daniele Ricci
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,15 +1,15 @@
 # sedentary-pg
 
-[![NPM version][npm-badge]][npm-url]
-[![Types][types-badge]][npm-url]
-[![NPM downloads][npm-downloads-badge]][npm-url]
-
 [![Build Status][travis-badge]][travis-url]
 [![Code Climate][code-badge]][code-url]
 [![Test Coverage][cover-badge]][code-url]
 
-[![Dependents][deps-badge]][npm-url]
+[![NPM version][npm-badge]][npm-url]
+[![NPM downloads][npm-downloads-badge]][npm-url]
 [![Stars][stars-badge]][github-url]
+
+[![Types][types-badge]][npm-url]
+[![Dependents][deps-badge]][npm-url]
 [![Donate][donate-badge]][donate-url]
 
 [code-badge]: https://codeclimate.com/github/iccicci/sedentary-pg/badges/gpa.svg
@@ -24,7 +24,7 @@
 [npm-url]: https://www.npmjs.com/package/sedentary-pg
 [stars-badge]: https://badgen.net/github/stars/iccicci/sedentary-pg?icon=github&cache=300
 [travis-badge]: https://badgen.net/travis/iccicci/sedentary-pg?icon=travis&cache=300
-[travis-url]: https://travis-ci.com/iccicci/sedentary-pg
+[travis-url]: https://app.travis-ci.com/github/iccicci/sedentary-pg
 [types-badge]: https://badgen.net/npm/types/sedentary-pg?color=green&icon=typescript&cache=300
 
 # under development

package/lib/pgdb.d.ts

@@ -2,6 +2,7 @@ import { PoolConfig } from "pg";
 import { DB, Field, Table } from "sedentary/lib/db";
 export declare class PGDB extends DB {
     private client;
+    private indexes;
     private pool;
     private version;
     constructor(connection: PoolConfig, log: (message: string) => void);
@@ -15,6 +16,7 @@ export declare class PGDB extends DB {
     sync(): Promise<void>;
     syncConstraints(table: Table): Promise<void>;
     syncFields(table: Table): Promise<void>;
+    syncIndexes(table: Table): Promise<void>;
     syncSequence(table: Table): Promise<void>;
     syncTable(table: Table): Promise<void>;
 }

package/lib/pgdb.js

@@ -71,7 +71,31 @@ class PGDB extends db_1.DB {
             if (table.fields.filter(f => f.fieldName === res.rows[i].attname).length === 0)
                 await this.dropField(table.tableName, res.rows[i].attname);
     }
-    async dropIndexes(table) { }
+    async dropIndexes(table) {
+        const { indexes, oid } = table;
+        const iobject = {};
+        const res = await this.client.query("SELECT amname, attname, indisunique, relname FROM pg_class, pg_index, pg_attribute, pg_am WHERE indrelid = $1 AND indexrelid = pg_class.oid AND attrelid = pg_class.oid AND relam = pg_am.oid ORDER BY attnum", [oid]);
+        for (const row of res.rows) {
+            const { amname, attname, indisunique, relname } = row;
+            if (iobject[relname])
+                iobject[relname].fields.push(attname);
+            else
+                iobject[relname] = { fields: [attname], name: relname, type: amname, unique: indisunique };
+        }
+        this.indexes = [];
+        for (const index of indexes) {
+            const { name } = index;
+            if (iobject[name] && this.indexesEq(index, iobject[name])) {
+                this.indexes.push(name);
+                delete iobject[name];
+            }
+        }
+        for (const index of Object.keys(iobject).sort()) {
+            const statement = `DROP INDEX ${index}`;
+            this.log(statement);
+            await this.client.query(statement);
+        }
+    }
     async end() {
         await this.pool.end();
     }
@@ -119,10 +143,9 @@ class PGDB extends db_1.DB {
     }
     async syncFields(table) {
         const { fields, oid, tableName } = table;
-        for (const i in fields) {
-            const field = fields[i];
-            const { fieldName, size } = field;
-            const defaultValue = field.defaultValue === undefined ? undefined : pg_format_1.default("%L", field.defaultValue);
+        for (const field of fields) {
+            const { fieldName, notNull, size } = field;
+            const defaultValue = field.defaultValue === undefined ? undefined : (0, pg_format_1.default)("%L", field.defaultValue);
             const [base, type] = this.fieldType(field);
             const res = await this.client.query(`SELECT *${this.version >= 12 ? ", pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) AS adsrc" : ""} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2`, [oid, fieldName]);
             const addField = async () => {
@@ -142,17 +165,26 @@ class PGDB extends db_1.DB {
                 this.log(statement);
                 await this.client.query(statement);
             };
+            const setNotNull = async (isNull) => {
+                if (isNull === notNull)
+                    return;
+                const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} ${notNull ? "SET" : "DROP"} NOT NULL`;
+                this.log(statement);
+                await this.client.query(statement);
+            };
             if (!res.rowCount) {
                 await addField();
                 await setDefault();
+                await setNotNull(false);
             }
             else {
-                const { adsrc, typname, atttypmod } = res.rows[0];
+                const { adsrc, attnotnull, atttypmod, typname } = res.rows[0];
                 if (types[typname] !== base || (base === "VARCHAR" && (size ? size + 4 !== atttypmod : atttypmod !== -1))) {
                     if (needDrop.filter(([type, name]) => field.type === type && typname === name).length) {
                         await this.dropField(tableName, fieldName);
                         await addField();
                         await setDefault();
+                        await setNotNull(false);
                     }
                     else {
                         if (adsrc)
@@ -162,14 +194,29 @@ class PGDB extends db_1.DB {
                         this.log(statement);
                         await this.client.query(statement);
                         await setDefault();
+                        await setNotNull(attnotnull);
                     }
                 }
                 else if (defaultValue === undefined) {
                     if (adsrc)
                         dropDefault();
+                    await setNotNull(attnotnull);
                 }
-                else if (!adsrc || adsrc.split("::")[0] !== defaultValue)
+                else if (!adsrc || adsrc.split("::")[0] !== defaultValue) {
                     await setDefault();
+                    await setNotNull(attnotnull);
+                }
+            }
+        }
+    }
+    async syncIndexes(table) {
+        const { indexes, tableName } = table;
+        for (const index of indexes) {
+            const { fields, name, type, unique } = index;
+            if (this.indexes.indexOf(name) === -1) {
+                const statement = `CREATE${unique ? " UNIQUE" : ""} INDEX ${name} ON ${tableName} USING ${type} (${fields.join(", ")})`;
+                this.log(statement);
+                await this.client.query(statement);
             }
         }
     }

package/lib/pgdb.ts

@@ -1,6 +1,6 @@
 import { Pool, PoolClient, PoolConfig } from "pg";
 import format from "pg-format";
-import { DB, Field, Table } from "sedentary/lib/db";
+import { DB, Field, IndexDef, Table } from "sedentary/lib/db";
 
 const needDrop = [
   ["DATETIME", "int2"],
@@ -18,6 +18,7 @@ const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", varchar: "VAR
 
 export class PGDB extends DB {
   private client: PoolClient;
+  private indexes: string[];
   private pool: Pool;
   private version: number;
 
@@ -83,7 +84,38 @@ export class PGDB extends DB {
     for(const i in res.rows) if(table.fields.filter(f => f.fieldName === res.rows[i].attname).length === 0) await this.dropField(table.tableName, res.rows[i].attname);
   }
 
-  async dropIndexes(table: Table): Promise<void> {}
+  async dropIndexes(table: Table): Promise<void> {
+    const { indexes, oid } = table;
+    const iobject: { [key: string]: IndexDef } = {};
+    const res = await this.client.query(
+      "SELECT amname, attname, indisunique, relname FROM pg_class, pg_index, pg_attribute, pg_am WHERE indrelid = $1 AND indexrelid = pg_class.oid AND attrelid = pg_class.oid AND relam = pg_am.oid ORDER BY attnum",
+      [oid]
+    );
+
+    for(const row of res.rows) {
+      const { amname, attname, indisunique, relname } = row;
+
+      if(iobject[relname]) iobject[relname].fields.push(attname);
+      else iobject[relname] = { fields: [attname], name: relname, type: amname, unique: indisunique };
+    }
+
+    this.indexes = [];
+    for(const index of indexes) {
+      const { name } = index;
+
+      if(iobject[name] && this.indexesEq(index, iobject[name])) {
+        this.indexes.push(name);
+        delete iobject[name];
+      }
+    }
+
+    for(const index of Object.keys(iobject).sort()) {
+      const statement = `DROP INDEX ${index}`;
+
+      this.log(statement);
+      await this.client.query(statement);
+    }
+  }
 
   async end(): Promise<void> {
     await this.pool.end();
@@ -144,9 +176,8 @@ export class PGDB extends DB {
   async syncFields(table: Table): Promise<void> {
     const { fields, oid, tableName } = table;
 
-    for(const i in fields) {
-      const field = fields[i];
-      const { fieldName, size } = field;
+    for(const field of fields) {
+      const { fieldName, notNull, size } = field;
       const defaultValue = field.defaultValue === undefined ? undefined : format("%L", field.defaultValue);
       const [base, type] = this.fieldType(field);
 
@@ -180,17 +211,28 @@ export class PGDB extends DB {
         await this.client.query(statement);
       };
 
+      const setNotNull = async (isNull: boolean) => {
+        if(isNull === notNull) return;
+
+        const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} ${notNull ? "SET" : "DROP"} NOT NULL`;
+
+        this.log(statement);
+        await this.client.query(statement);
+      };
+
       if(! res.rowCount) {
         await addField();
         await setDefault();
+        await setNotNull(false);
       } else {
-        const { adsrc, typname, atttypmod } = res.rows[0];
+        const { adsrc, attnotnull, atttypmod, typname } = res.rows[0];
 
         if(types[typname] !== base || (base === "VARCHAR" && (size ? size + 4 !== atttypmod : atttypmod !== -1))) {
           if(needDrop.filter(([type, name]) => field.type === type && typname === name).length) {
             await this.dropField(tableName, fieldName);
             await addField();
             await setDefault();
+            await setNotNull(false);
           } else {
             if(adsrc) dropDefault();
 
@@ -200,10 +242,30 @@ export class PGDB extends DB {
             this.log(statement);
             await this.client.query(statement);
             await setDefault();
+            await setNotNull(attnotnull);
           }
         } else if(defaultValue === undefined) {
           if(adsrc) dropDefault();
-        } else if(! adsrc || adsrc.split("::")[0] !== defaultValue) await setDefault();
+          await setNotNull(attnotnull);
+        } else if(! adsrc || adsrc.split("::")[0] !== defaultValue) {
+          await setDefault();
+          await setNotNull(attnotnull);
+        }
+      }
+    }
+  }
+
+  async syncIndexes(table: Table): Promise<void> {
+    const { indexes, tableName } = table;
+
+    for(const index of indexes) {
+      const { fields, name, type, unique } = index;
+
+      if(this.indexes.indexOf(name) === -1) {
+        const statement = `CREATE${unique ? " UNIQUE" : ""} INDEX ${name} ON ${tableName} USING ${type} (${fields.join(", ")})`;
+
+        this.log(statement);
+        await this.client.query(statement);
       }
     }
   }

package/package.json

@@ -2,29 +2,29 @@
   "author": "Daniele Ricci <daniele.icc@gmail.com> (https://github.com/iccicci)",
   "bugs": "https://github.com/iccicci/sedentary-pg/issues",
   "dependencies": {
-    "@types/pg": "7.14.7",
-    "@types/pg-format": "1.0.1",
-    "pg": "8.5.1",
+    "@types/pg": "8.6.1",
+    "@types/pg-format": "1.0.2",
+    "pg": "8.7.1",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.11"
+    "sedentary": "0.0.12"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
-    "@types/mocha": "8.2.0",
-    "@types/node": "14.14.16",
+    "@types/mocha": "9.0.0",
+    "@types/node": "16.11.6",
     "@types/yamljs": "0.2.31",
-    "@typescript-eslint/eslint-plugin": "4.11.1",
-    "@typescript-eslint/parser": "4.11.1",
-    "eslint": "7.16.0",
-    "mocha": "8.2.1",
+    "@typescript-eslint/eslint-plugin": "5.3.0",
+    "@typescript-eslint/parser": "5.3.0",
+    "eslint": "8.2.0",
+    "mocha": "9.1.3",
     "nyc": "15.1.0",
-    "prettier": "2.2.1",
-    "ts-node": "9.1.1",
-    "typescript": "4.1.3",
+    "prettier": "2.4.1",
+    "ts-node": "10.4.0",
+    "typescript": "4.4.4",
     "yamljs": "0.3.0"
   },
   "engines": {
-    "node": ">=10.0"
+    "node": ">=12.0"
   },
   "homepage": "https://github.com/iccicci/sedentary-pg#readme",
   "keywords": [
@@ -59,5 +59,5 @@
     "version": "node -r ts-node/register utils.ts version"
   },
   "types": "index.d.ts",
-  "version": "0.0.11"
-}
+  "version": "0.0.12"
+}