sedentary-pg 0.0.35 → 0.0.38

package/dist/cjs/index.js

@@ -24,6 +24,9 @@ class SedentaryPG extends sedentary_1.Sedentary {
     async begin() {
         return this.db.begin();
     }
+    async client() {
+        return this.db.client();
+    }
 }
 exports.SedentaryPG = SedentaryPG;
 exports.Package = SedentaryPG;

package/dist/cjs/pgdb.js

@@ -16,12 +16,13 @@ const needDrop = [
     ["INT8", "timestamptz"]
 ];
 const needUsing = [
+    ["BOOLEAN", "varchar"],
     ["DATETIME", "varchar"],
     ["INT", "varchar"],
     ["INT8", "varchar"],
     ["NUMBER", "varchar"]
 ];
-const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
+const types = { bool: "BOOL", int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
 const actions = { cascade: "c", "no action": "a", restrict: "r", "set default": "d", "set null": "n" };
 function parseInt8(value) {
     return BigInt(value);
@@ -34,19 +35,21 @@ pg_1.types.setTypeParser(1700, parseNumber);
 class PGDB extends sedentary_1.DB {
     constructor(connection, log) {
         super(log);
-        this.oidLoad = {};
-        this.client = {};
+        this._client = {};
         this.indexes = [];
-        this.pool = new pg_1.Pool(connection);
+        this.oidLoad = {};
+        this.released = false;
         this.version = 0;
+        this.pool = new pg_1.Pool(connection);
     }
     async connect() {
-        this.client = await this.pool.connect();
-        const res = await this.client.query("SELECT version()");
+        this._client = await this.pool.connect();
+        const res = await this._client.query("SELECT version()");
         this.version = parseInt(res.rows[0].version.split(" ")[1].split(".")[0], 10);
     }
     async end() {
-        this.client.release();
+        if (!this.released)
+            this._client.release();
         await this.pool.end();
     }
     defaultNeq(src, value) {
@@ -56,9 +59,13 @@ class PGDB extends sedentary_1.DB {
     }
     async begin() {
         const ret = new TransactionPG(this.log, await this.pool.connect());
-        await ret.client.query("BEGIN");
+        this.log("BEGIN");
+        await ret._client.query("BEGIN");
         return ret;
     }
+    async client() {
+        return await this.pool.connect();
+    }
     escape(value) {
         if (value === null || value === undefined)
             throw new Error("SedentaryPG: Can't escape null nor undefined values; use the 'IS NULL' operator instead");
@@ -82,7 +89,7 @@ class PGDB extends sedentary_1.DB {
         return async (where, order, tx, lock) => {
             const { oid } = table;
             const ret = [];
-            const client = tx ? tx.client : await this.pool.connect();
+            const client = tx ? tx._client : await this.pool.connect();
             const oidPK = {};
             try {
                 const forUpdate = lock ? " FOR UPDATE" : "";
@@ -127,7 +134,7 @@ class PGDB extends sedentary_1.DB {
         const pkAttrnName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx.client : await self.pool.connect();
+            const client = this.tx ? this.tx._client : await self.pool.connect();
             let removed = false;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrnName])}`;
@@ -147,7 +154,7 @@ class PGDB extends sedentary_1.DB {
         const pkAttrnName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx.client : await self.pool.connect();
+            const client = this.tx ? this.tx._client : await self.pool.connect();
             let changed = false;
             try {
                 const { loaded } = this;
@@ -190,7 +197,7 @@ class PGDB extends sedentary_1.DB {
     }
     async dropConstraints(table) {
         const indexes = [];
-        const res = await this.client.query("SELECT confdeltype, confupdtype, conindid, conname, contype FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
+        const res = await this._client.query("SELECT confdeltype, confupdtype, conindid, conname, contype FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
         for (const row of res.rows) {
             const arr = table.constraints.filter(_ => _.constraintName === row.conname && _.type === row.contype);
             let drop = false;
@@ -207,7 +214,7 @@ class PGDB extends sedentary_1.DB {
                 const statement = `ALTER TABLE ${table.tableName} DROP CONSTRAINT ${row.conname} CASCADE`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
         return indexes;
@@ -216,10 +223,10 @@ class PGDB extends sedentary_1.DB {
         const statement = `ALTER TABLE ${tableName} DROP COLUMN ${fieldName}`;
         this.syncLog(statement);
         if (this.sync)
-            await this.client.query(statement);
+            await this._client.query(statement);
     }
     async dropFields(table) {
-        const res = await this.client.query("SELECT attname FROM pg_attribute WHERE attrelid = $1 AND attnum > 0 AND attisdropped = false AND attinhcount = 0", [table.oid]);
+        const res = await this._client.query("SELECT attname FROM pg_attribute WHERE attrelid = $1 AND attnum > 0 AND attisdropped = false AND attinhcount = 0", [table.oid]);
         for (const i in res.rows)
             if (!table.findField(res.rows[i].attname))
                 await this.dropField(table.tableName, res.rows[i].attname);
@@ -227,7 +234,7 @@ class PGDB extends sedentary_1.DB {
     async dropIndexes(table, constraintIndexes) {
         const { indexes, oid } = table;
         const iobject = {};
-        const res = await this.client.query("SELECT amname, attname, indexrelid, 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]);
+        const res = await this._client.query("SELECT amname, attname, indexrelid, 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, indexrelid, indisunique, relname } = row;
             if (!constraintIndexes.includes(indexrelid)) {
@@ -249,13 +256,13 @@ class PGDB extends sedentary_1.DB {
             const statement = `DROP INDEX ${index}`;
             this.syncLog(statement);
             if (this.sync)
-                await this.client.query(statement);
+                await this._client.query(statement);
         }
     }
     async syncConstraints(table) {
         for (const constraint of table.constraints) {
             const { attribute, constraintName, type } = constraint;
-            const res = await this.client.query("SELECT attname FROM pg_attribute, pg_constraint WHERE attrelid = $1 AND conrelid = $1 AND attnum = conkey[1] AND attname = $2", [
+            const res = await this._client.query("SELECT attname FROM pg_attribute, pg_constraint WHERE attrelid = $1 AND conrelid = $1 AND attnum = conkey[1] AND attname = $2", [
                 table.oid,
                 attribute.fieldName
             ]);
@@ -272,19 +279,30 @@ class PGDB extends sedentary_1.DB {
                 const statement = `ALTER TABLE ${table.tableName} ADD CONSTRAINT ${constraintName} ${query}`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
     }
     async syncDataBase() {
-        await super.syncDataBase();
-        for (const table of this.tables)
-            this.oidLoad[table.oid || 0] = (ids) => table.model.load({ [table.pk.attributeName]: ["IN", ids] });
+        try {
+            await super.syncDataBase();
+            for (const table of this.tables)
+                this.oidLoad[table.oid || 0] = (ids) => table.model.load({ [table.pk.attributeName]: ["IN", ids] });
+        }
+        catch (e) {
+            throw e;
+        }
+        finally {
+            this.released = true;
+            this._client.release();
+        }
     }
     fieldType(attribute) {
         const { size, type } = attribute;
         let ret;
         switch (type) {
+            case "BOOLEAN":
+                return ["BOOL", "BOOL"];
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
             case "NUMBER":
@@ -306,18 +324,18 @@ class PGDB extends sedentary_1.DB {
             const defaultValue = attribute.defaultValue === undefined ? (autoIncrement && fieldName === "id" ? `nextval('${tableName}_id_seq'::regclass)` : undefined) : this.escape(attribute.defaultValue);
             const [base, type] = this.fieldType(attribute);
             const where = "attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2";
-            const res = await this.client.query(`SELECT attnotnull, atttypmod, typname, ${(0, adsrc_1.adsrc)(this.version)} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
+            const res = await this._client.query(`SELECT attnotnull, atttypmod, typname, ${(0, adsrc_1.adsrc)(this.version)} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
             const addField = async () => {
                 const statement = `ALTER TABLE ${tableName} ADD COLUMN ${fieldName} ${type}`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             };
             const dropDefault = async () => {
                 const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} DROP DEFAULT`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             };
             const setNotNull = async (isNotNull) => {
                 if (isNotNull === notNull)
@@ -325,19 +343,19 @@ class PGDB extends sedentary_1.DB {
                 const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} ${notNull ? "SET" : "DROP"} NOT NULL`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             };
             const setDefault = async (isNotNull, create) => {
                 if (defaultValue !== undefined) {
                     let statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} SET DEFAULT ${defaultValue}`;
                     this.syncLog(statement);
                     if (this.sync)
-                        await this.client.query(statement);
+                        await this._client.query(statement);
                     if (!isNotNull && !create) {
                         statement = `UPDATE ${tableName} SET ${fieldName} = ${defaultValue} WHERE ${fieldName} IS NULL`;
                         this.syncLog(statement);
                         if (this.sync)
-                            this.client.query(statement);
+                            this._client.query(statement);
                     }
                 }
                 await setNotNull(isNotNull);
@@ -361,7 +379,7 @@ class PGDB extends sedentary_1.DB {
                         const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} TYPE ${type}${using}`;
                         this.syncLog(statement);
                         if (this.sync)
-                            await this.client.query(statement);
+                            await this._client.query(statement);
                         await setDefault(attnotnull, false);
                     }
                 }
@@ -383,7 +401,7 @@ class PGDB extends sedentary_1.DB {
                 const statement = `CREATE${unique ? " UNIQUE" : ""} INDEX ${indexName} ON ${tableName} USING ${type} (${fields.join(", ")})`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
     }
@@ -393,13 +411,13 @@ class PGDB extends sedentary_1.DB {
         const statement = `ALTER SEQUENCE ${table.tableName}_id_seq OWNED BY ${table.tableName}.id`;
         this.syncLog(statement);
         if (this.sync)
-            await this.client.query(statement);
+            await this._client.query(statement);
     }
     async syncTable(table) {
         if (table.autoIncrement) {
             await (async () => {
                 try {
-                    await this.client.query(`SELECT currval('${table.tableName}_id_seq')`);
+                    await this._client.query(`SELECT currval('${table.tableName}_id_seq')`);
                 }
                 catch (e) {
                     if (e instanceof pg_1.DatabaseError && e.code === "55000")
@@ -408,7 +426,7 @@ class PGDB extends sedentary_1.DB {
                         const statement = `CREATE SEQUENCE ${table.tableName}_id_seq`;
                         this.syncLog(statement);
                         if (this.sync)
-                            await this.client.query(statement);
+                            await this._client.query(statement);
                         table.autoIncrementOwn = true;
                         return;
                     }
@@ -417,11 +435,11 @@ class PGDB extends sedentary_1.DB {
             })();
         }
         let create = false;
-        const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
+        const resTable = await this._client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
         if (resTable.rowCount) {
             table.oid = resTable.rows[0].oid;
             let drop = false;
-            const resParent = await this.client.query("SELECT inhparent FROM pg_inherits WHERE inhrelid = $1", [table.oid]);
+            const resParent = await this._client.query("SELECT inhparent FROM pg_inherits WHERE inhrelid = $1", [table.oid]);
             if (resParent.rowCount) {
                 if (!table.parent)
                     drop = true;
@@ -436,7 +454,7 @@ class PGDB extends sedentary_1.DB {
                 create = true;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
         else
@@ -446,8 +464,8 @@ class PGDB extends sedentary_1.DB {
             const statement = `CREATE TABLE ${table.tableName} ()${parent}`;
             this.syncLog(statement);
             if (this.sync)
-                await this.client.query(statement);
-            const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
+                await this._client.query(statement);
+            const resTable = await this._client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
             table.oid = resTable.rows[0]?.oid;
         }
     }
@@ -457,16 +475,19 @@ class TransactionPG extends sedentary_1.Transaction {
     constructor(log, client) {
         super(log);
         this.released = false;
-        this.client = client;
+        this._client = client;
+    }
+    async client() {
+        return this._client;
     }
     release() {
         this.released = true;
-        this.client.release();
+        this._client.release();
     }
     async commit() {
         if (!this.released) {
             this.log("COMMIT");
-            await this.client.query("COMMIT");
+            await this._client.query("COMMIT");
             this.release();
             super.commit();
         }
@@ -476,7 +497,7 @@ class TransactionPG extends sedentary_1.Transaction {
             if (!this.released) {
                 super.rollback();
                 this.log("ROLLBACK");
-                await this.client.query("ROLLBACK");
+                await this._client.query("ROLLBACK");
             }
         }
         finally {

package/dist/es/index.js

@@ -18,5 +18,8 @@ export class SedentaryPG extends Sedentary {
     async begin() {
         return this.db.begin();
     }
+    async client() {
+        return this.db.client();
+    }
 }
 export const Package = SedentaryPG;

package/dist/es/pgdb.js

@@ -10,12 +10,13 @@ const needDrop = [
     ["INT8", "timestamptz"]
 ];
 const needUsing = [
+    ["BOOLEAN", "varchar"],
     ["DATETIME", "varchar"],
     ["INT", "varchar"],
     ["INT8", "varchar"],
     ["NUMBER", "varchar"]
 ];
-const types = { int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
+const types = { bool: "BOOL", int2: "SMALLINT", int4: "INTEGER", int8: "BIGINT", numeric: "NUMERIC", timestamptz: "DATETIME", varchar: "VARCHAR" };
 const actions = { cascade: "c", "no action": "a", restrict: "r", "set default": "d", "set null": "n" };
 function parseInt8(value) {
     return BigInt(value);
@@ -26,25 +27,24 @@ function parseNumber(value) {
 PGtypes.setTypeParser(20, parseInt8);
 PGtypes.setTypeParser(1700, parseNumber);
 export class PGDB extends DB {
-    client;
-    indexes;
+    _client = {};
+    indexes = [];
     oidLoad = {};
     pool;
-    version;
+    released = false;
+    version = 0;
     constructor(connection, log) {
         super(log);
-        this.client = {};
-        this.indexes = [];
         this.pool = new Pool(connection);
-        this.version = 0;
     }
     async connect() {
-        this.client = await this.pool.connect();
-        const res = await this.client.query("SELECT version()");
+        this._client = await this.pool.connect();
+        const res = await this._client.query("SELECT version()");
         this.version = parseInt(res.rows[0].version.split(" ")[1].split(".")[0], 10);
     }
     async end() {
-        this.client.release();
+        if (!this.released)
+            this._client.release();
         await this.pool.end();
     }
     defaultNeq(src, value) {
@@ -54,9 +54,13 @@ export class PGDB extends DB {
     }
     async begin() {
         const ret = new TransactionPG(this.log, await this.pool.connect());
-        await ret.client.query("BEGIN");
+        this.log("BEGIN");
+        await ret._client.query("BEGIN");
         return ret;
     }
+    async client() {
+        return await this.pool.connect();
+    }
     escape(value) {
         if (value === null || value === undefined)
             throw new Error("SedentaryPG: Can't escape null nor undefined values; use the 'IS NULL' operator instead");
@@ -80,7 +84,7 @@ export class PGDB extends DB {
         return async (where, order, tx, lock) => {
             const { oid } = table;
             const ret = [];
-            const client = tx ? tx.client : await this.pool.connect();
+            const client = tx ? tx._client : await this.pool.connect();
             const oidPK = {};
             try {
                 const forUpdate = lock ? " FOR UPDATE" : "";
@@ -125,7 +129,7 @@ export class PGDB extends DB {
         const pkAttrnName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx.client : await self.pool.connect();
+            const client = this.tx ? this.tx._client : await self.pool.connect();
             let removed = false;
             try {
                 const query = `DELETE FROM ${tableName} WHERE ${pkFldName} = ${self.escape(this[pkAttrnName])}`;
@@ -145,7 +149,7 @@ export class PGDB extends DB {
         const pkAttrnName = pk.attributeName;
         const pkFldName = pk.fieldName;
         return async function () {
-            const client = this.tx ? this.tx.client : await self.pool.connect();
+            const client = this.tx ? this.tx._client : await self.pool.connect();
             let changed = false;
             try {
                 const { loaded } = this;
@@ -188,7 +192,7 @@ export class PGDB extends DB {
     }
     async dropConstraints(table) {
         const indexes = [];
-        const res = await this.client.query("SELECT confdeltype, confupdtype, conindid, conname, contype FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
+        const res = await this._client.query("SELECT confdeltype, confupdtype, conindid, conname, contype FROM pg_constraint WHERE conrelid = $1 ORDER BY conname", [table.oid]);
         for (const row of res.rows) {
             const arr = table.constraints.filter(_ => _.constraintName === row.conname && _.type === row.contype);
             let drop = false;
@@ -205,7 +209,7 @@ export class PGDB extends DB {
                 const statement = `ALTER TABLE ${table.tableName} DROP CONSTRAINT ${row.conname} CASCADE`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
         return indexes;
@@ -214,10 +218,10 @@ export class PGDB extends DB {
         const statement = `ALTER TABLE ${tableName} DROP COLUMN ${fieldName}`;
         this.syncLog(statement);
         if (this.sync)
-            await this.client.query(statement);
+            await this._client.query(statement);
     }
     async dropFields(table) {
-        const res = await this.client.query("SELECT attname FROM pg_attribute WHERE attrelid = $1 AND attnum > 0 AND attisdropped = false AND attinhcount = 0", [table.oid]);
+        const res = await this._client.query("SELECT attname FROM pg_attribute WHERE attrelid = $1 AND attnum > 0 AND attisdropped = false AND attinhcount = 0", [table.oid]);
         for (const i in res.rows)
             if (!table.findField(res.rows[i].attname))
                 await this.dropField(table.tableName, res.rows[i].attname);
@@ -225,7 +229,7 @@ export class PGDB extends DB {
     async dropIndexes(table, constraintIndexes) {
         const { indexes, oid } = table;
         const iobject = {};
-        const res = await this.client.query("SELECT amname, attname, indexrelid, 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]);
+        const res = await this._client.query("SELECT amname, attname, indexrelid, 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, indexrelid, indisunique, relname } = row;
             if (!constraintIndexes.includes(indexrelid)) {
@@ -247,13 +251,13 @@ export class PGDB extends DB {
             const statement = `DROP INDEX ${index}`;
             this.syncLog(statement);
             if (this.sync)
-                await this.client.query(statement);
+                await this._client.query(statement);
         }
     }
     async syncConstraints(table) {
         for (const constraint of table.constraints) {
             const { attribute, constraintName, type } = constraint;
-            const res = await this.client.query("SELECT attname FROM pg_attribute, pg_constraint WHERE attrelid = $1 AND conrelid = $1 AND attnum = conkey[1] AND attname = $2", [
+            const res = await this._client.query("SELECT attname FROM pg_attribute, pg_constraint WHERE attrelid = $1 AND conrelid = $1 AND attnum = conkey[1] AND attname = $2", [
                 table.oid,
                 attribute.fieldName
             ]);
@@ -270,19 +274,30 @@ export class PGDB extends DB {
                 const statement = `ALTER TABLE ${table.tableName} ADD CONSTRAINT ${constraintName} ${query}`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
     }
     async syncDataBase() {
-        await super.syncDataBase();
-        for (const table of this.tables)
-            this.oidLoad[table.oid || 0] = (ids) => table.model.load({ [table.pk.attributeName]: ["IN", ids] });
+        try {
+            await super.syncDataBase();
+            for (const table of this.tables)
+                this.oidLoad[table.oid || 0] = (ids) => table.model.load({ [table.pk.attributeName]: ["IN", ids] });
+        }
+        catch (e) {
+            throw e;
+        }
+        finally {
+            this.released = true;
+            this._client.release();
+        }
     }
     fieldType(attribute) {
         const { size, type } = attribute;
         let ret;
         switch (type) {
+            case "BOOLEAN":
+                return ["BOOL", "BOOL"];
             case "DATETIME":
                 return ["DATETIME", "TIMESTAMP (3) WITH TIME ZONE"];
             case "NUMBER":
@@ -304,18 +319,18 @@ export class PGDB extends DB {
             const defaultValue = attribute.defaultValue === undefined ? (autoIncrement && fieldName === "id" ? `nextval('${tableName}_id_seq'::regclass)` : undefined) : this.escape(attribute.defaultValue);
             const [base, type] = this.fieldType(attribute);
             const where = "attrelid = $1 AND attnum > 0 AND atttypid = pg_type.oid AND attislocal = 't' AND attname = $2";
-            const res = await this.client.query(`SELECT attnotnull, atttypmod, typname, ${adsrc(this.version)} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
+            const res = await this._client.query(`SELECT attnotnull, atttypmod, typname, ${adsrc(this.version)} FROM pg_type, pg_attribute LEFT JOIN pg_attrdef ON adrelid = attrelid AND adnum = attnum WHERE ${where}`, [oid, fieldName]);
             const addField = async () => {
                 const statement = `ALTER TABLE ${tableName} ADD COLUMN ${fieldName} ${type}`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             };
             const dropDefault = async () => {
                 const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} DROP DEFAULT`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             };
             const setNotNull = async (isNotNull) => {
                 if (isNotNull === notNull)
@@ -323,19 +338,19 @@ export class PGDB extends DB {
                 const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} ${notNull ? "SET" : "DROP"} NOT NULL`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             };
             const setDefault = async (isNotNull, create) => {
                 if (defaultValue !== undefined) {
                     let statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} SET DEFAULT ${defaultValue}`;
                     this.syncLog(statement);
                     if (this.sync)
-                        await this.client.query(statement);
+                        await this._client.query(statement);
                     if (!isNotNull && !create) {
                         statement = `UPDATE ${tableName} SET ${fieldName} = ${defaultValue} WHERE ${fieldName} IS NULL`;
                         this.syncLog(statement);
                         if (this.sync)
-                            this.client.query(statement);
+                            this._client.query(statement);
                     }
                 }
                 await setNotNull(isNotNull);
@@ -359,7 +374,7 @@ export class PGDB extends DB {
                         const statement = `ALTER TABLE ${tableName} ALTER COLUMN ${fieldName} TYPE ${type}${using}`;
                         this.syncLog(statement);
                         if (this.sync)
-                            await this.client.query(statement);
+                            await this._client.query(statement);
                         await setDefault(attnotnull, false);
                     }
                 }
@@ -381,7 +396,7 @@ export class PGDB extends DB {
                 const statement = `CREATE${unique ? " UNIQUE" : ""} INDEX ${indexName} ON ${tableName} USING ${type} (${fields.join(", ")})`;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
     }
@@ -391,13 +406,13 @@ export class PGDB extends DB {
         const statement = `ALTER SEQUENCE ${table.tableName}_id_seq OWNED BY ${table.tableName}.id`;
         this.syncLog(statement);
         if (this.sync)
-            await this.client.query(statement);
+            await this._client.query(statement);
     }
     async syncTable(table) {
         if (table.autoIncrement) {
             await (async () => {
                 try {
-                    await this.client.query(`SELECT currval('${table.tableName}_id_seq')`);
+                    await this._client.query(`SELECT currval('${table.tableName}_id_seq')`);
                 }
                 catch (e) {
                     if (e instanceof DatabaseError && e.code === "55000")
@@ -406,7 +421,7 @@ export class PGDB extends DB {
                         const statement = `CREATE SEQUENCE ${table.tableName}_id_seq`;
                         this.syncLog(statement);
                         if (this.sync)
-                            await this.client.query(statement);
+                            await this._client.query(statement);
                         table.autoIncrementOwn = true;
                         return;
                     }
@@ -415,11 +430,11 @@ export class PGDB extends DB {
             })();
         }
         let create = false;
-        const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
+        const resTable = await this._client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
         if (resTable.rowCount) {
             table.oid = resTable.rows[0].oid;
             let drop = false;
-            const resParent = await this.client.query("SELECT inhparent FROM pg_inherits WHERE inhrelid = $1", [table.oid]);
+            const resParent = await this._client.query("SELECT inhparent FROM pg_inherits WHERE inhrelid = $1", [table.oid]);
             if (resParent.rowCount) {
                 if (!table.parent)
                     drop = true;
@@ -434,7 +449,7 @@ export class PGDB extends DB {
                 create = true;
                 this.syncLog(statement);
                 if (this.sync)
-                    await this.client.query(statement);
+                    await this._client.query(statement);
             }
         }
         else
@@ -444,27 +459,30 @@ export class PGDB extends DB {
             const statement = `CREATE TABLE ${table.tableName} ()${parent}`;
             this.syncLog(statement);
             if (this.sync)
-                await this.client.query(statement);
-            const resTable = await this.client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
+                await this._client.query(statement);
+            const resTable = await this._client.query("SELECT oid FROM pg_class WHERE relname = $1", [table.tableName]);
             table.oid = resTable.rows[0]?.oid;
         }
     }
 }
 export class TransactionPG extends Transaction {
-    client;
+    _client;
     released = false;
     constructor(log, client) {
         super(log);
-        this.client = client;
+        this._client = client;
+    }
+    async client() {
+        return this._client;
     }
     release() {
         this.released = true;
-        this.client.release();
+        this._client.release();
     }
     async commit() {
         if (!this.released) {
             this.log("COMMIT");
-            await this.client.query("COMMIT");
+            await this._client.query("COMMIT");
             this.release();
             super.commit();
         }
@@ -474,7 +492,7 @@ export class TransactionPG extends Transaction {
             if (!this.released) {
                 super.rollback();
                 this.log("ROLLBACK");
-                await this.client.query("ROLLBACK");
+                await this._client.query("ROLLBACK");
             }
         }
         finally {

package/dist/types/index.d.ts

@@ -7,5 +7,6 @@ export declare class SedentaryPG extends Sedentary<PGDB, TransactionPG> {
     constructor(connection: PoolConfig, options?: SedentaryOptions);
     FKEY<N extends Natural, E extends EntryBase>(attribute: Attribute<N, E>, options?: ForeignKeyOptions): Type<N, E>;
     begin(): Promise<TransactionPG>;
+    client(): Promise<import("pg").PoolClient>;
 }
 export declare const Package: typeof SedentaryPG;

package/dist/types/pgdb.d.ts

@@ -1,16 +1,18 @@
 import { PoolClient, PoolConfig } from "pg";
 import { Attribute, DB, EntryBase, Natural, Table, Transaction } from "sedentary";
 export declare class PGDB extends DB<TransactionPG> {
-    private client;
+    private _client;
     private indexes;
     private oidLoad;
     private pool;
+    private released;
     private version;
     constructor(connection: PoolConfig, log: (message: string) => void);
     connect(): Promise<void>;
     end(): Promise<void>;
     defaultNeq(src: string, value: Natural): boolean;
     begin(): Promise<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[]>;
@@ -34,9 +36,10 @@ export declare class PGDB extends DB<TransactionPG> {
     syncTable(table: Table): Promise<void>;
 }
 export declare class TransactionPG extends Transaction {
-    client: PoolClient;
-    released: boolean;
+    private _client;
+    private released;
     constructor(log: (message: string) => void, client: PoolClient);
+    client(): Promise<PoolClient>;
     private release;
     commit(): Promise<void>;
     rollback(): Promise<void>;

package/package.json

@@ -9,7 +9,7 @@
     "@types/pg": "8.6.5",
     "pg": "8.7.3",
     "pg-format": "1.0.4",
-    "sedentary": "0.0.35"
+    "sedentary": "0.0.38"
   },
   "description": "The ORM which never needs to migrate - PostgreSQL",
   "devDependencies": {
@@ -84,5 +84,5 @@
     }
   },
   "types": "./dist/types/index.d.ts",
-  "version": "0.0.35"
+  "version": "0.0.38"
 }