oak-db 3.3.13 → 4.0.0

package/lib/PostgreSQL/connector.js

@@ -5,13 +5,16 @@ const tslib_1 = require("tslib");
 const pg_1 = require("pg");
 const uuid_1 = require("uuid");
 const assert_1 = tslib_1.__importDefault(require("assert"));
+const migration_1 = require("./migration");
 class PostgreSQLConnector {
     pool;
     configuration;
     txnDict;
+    txnExecQueueDict;
     constructor(configuration) {
         this.configuration = configuration;
         this.txnDict = {};
+        this.txnExecQueueDict = {};
         this.pool = new pg_1.Pool(configuration);
         // 错误处理
         this.pool.on('error', (err) => {
@@ -36,37 +39,29 @@ class PostgreSQLConnector {
         await this.pool.end();
     }
     async startTransaction(option) {
-        const startInner = async () => {
-            const connection = await this.pool.connect();
-            // 添加：检测连接是否已被其他事务占用
-            for (const txn2 in this.txnDict) {
-                if (this.txnDict[txn2] === connection) {
-                    return new Promise((resolve) => {
-                        this.pool.on('release', () => resolve(startInner()));
-                    });
-                }
-            }
-            try {
-                let beginStmt = 'BEGIN';
-                if (option?.isolationLevel) {
-                    // PostgreSQL 隔离级别: 
-                    // READ UNCOMMITTED, READ COMMITTED, REPEATABLE READ, SERIALIZABLE
-                    // 注意: PostgreSQL 的 READ UNCOMMITTED 行为等同于 READ COMMITTED
-                    const level = this.mapIsolationLevel(option.isolationLevel);
-                    beginStmt = `BEGIN ISOLATION LEVEL ${level}`;
-                }
-                await connection.query(beginStmt);
-                const id = (0, uuid_1.v4)();
-                this.txnDict[id] = connection;
-                return id;
-            }
-            catch (error) {
-                // 如果启动事务失败，释放连接
-                connection.release();
-                throw error;
+        const connection = await this.pool.connect();
+        const id = (0, uuid_1.v4)();
+        try {
+            let beginStmt = 'BEGIN';
+            if (option?.isolationLevel) {
+                // PostgreSQL 隔离级别: 
+                // READ UNCOMMITTED, READ COMMITTED, REPEATABLE READ, SERIALIZABLE
+                // 注意: PostgreSQL 的 READ UNCOMMITTED 行为等同于 READ COMMITTED
+                const level = this.mapIsolationLevel(option.isolationLevel);
+                beginStmt = `BEGIN ISOLATION LEVEL ${level}`;
             }
-        };
-        return startInner();
+            await connection.query(beginStmt);
+            this.txnDict[id] = connection;
+            this.txnExecQueueDict[id] = Promise.resolve();
+            return id;
+        }
+        catch (error) {
+            // 如果启动事务失败，释放连接
+            connection.release();
+            delete this.txnDict[id];
+            delete this.txnExecQueueDict[id];
+            throw error;
+        }
     }
     /**
      * 映射隔离级别到 PostgreSQL 语法
@@ -90,46 +85,58 @@ class PostgreSQLConnector {
         if (process.env.NODE_ENV === 'development') {
             // console.log(`SQL: ${sql}; \n`);
         }
-        try {
-            let result;
-            if (txn) {
-                const connection = this.txnDict[txn];
-                (0, assert_1.default)(connection, `Transaction ${txn} not found`);
-                result = await connection.query(sql);
-            }
-            else {
-                result = await this.pool.query(sql);
-            }
+        if (txn) {
+            const result = await this.enqueueTxnQuery(txn, (connection) => connection.query(sql));
             // 返回格式与 mysql2 兼容: [rows, fields/result]
             return [result.rows, result];
         }
-        catch (error) {
-            // 增强错误信息
-            const enhancedError = new Error(`PostgreSQL query failed: ${error.message}\nSQL: ${sql.slice(0, 500)}${sql.length > 500 ? '...' : ''}`);
-            enhancedError.originalError = error;
-            enhancedError.sql = sql;
-            throw enhancedError;
-        }
+        const result = await this.pool.query(sql);
+        // 返回格式与 mysql2 兼容: [rows, fields/result]
+        return [result.rows, result];
+    }
+    async enqueueTxnQuery(txn, executor) {
+        const connection = this.txnDict[txn];
+        (0, assert_1.default)(connection, `Transaction ${txn} not found`);
+        return this.enqueueTxnTask(txn, () => executor(connection));
+    }
+    async enqueueTxnTask(txn, executor) {
+        const queued = this.txnExecQueueDict[txn] || Promise.resolve();
+        const task = queued
+            .catch(() => undefined)
+            .then(() => executor());
+        this.txnExecQueueDict[txn] = task.then(() => undefined, () => undefined);
+        return task;
+    }
+    async readSchema(translator) {
+        return (0, migration_1.readPostgreSqlSchema)(this, translator);
+    }
+    async inspectSchema(translator) {
+        return (0, migration_1.inspectPostgreSqlSchema)(this, translator);
+    }
+    diffSchema(currentSchema, targetSchema, translator, options) {
+        return (0, migration_1.buildPostgreSqlMigrationPlan)(currentSchema, targetSchema, translator, options);
     }
     async commitTransaction(txn) {
         const connection = this.txnDict[txn];
         (0, assert_1.default)(connection, `Transaction ${txn} not found`);
+        delete this.txnDict[txn];
         try {
-            await connection.query('COMMIT');
+            await this.enqueueTxnTask(txn, () => connection.query('COMMIT'));
         }
         finally {
-            delete this.txnDict[txn];
+            delete this.txnExecQueueDict[txn];
             connection.release();
         }
     }
     async rollbackTransaction(txn) {
         const connection = this.txnDict[txn];
         (0, assert_1.default)(connection, `Transaction ${txn} not found`);
+        delete this.txnDict[txn];
         try {
-            await connection.query('ROLLBACK');
+            await this.enqueueTxnTask(txn, () => connection.query('ROLLBACK'));
         }
         finally {
-            delete this.txnDict[txn];
+            delete this.txnExecQueueDict[txn];
             connection.release();
         }
     }

package/lib/PostgreSQL/migration.d.ts

@@ -0,0 +1,10 @@
+import { EntityDict } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { MigrationSchema, MigrationPlanningOptions, Plan, SchemaInspectionResult } from '../types/migration';
+import { PostgreSQLConnector } from './connector';
+import { PostgreSQLTranslator } from './translator';
+type PostgreSqlMigrationEntityDict = EntityDict & BaseEntityDict;
+export declare function readPostgreSqlSchema<ED extends PostgreSqlMigrationEntityDict>(connector: PostgreSQLConnector, translator: PostgreSQLTranslator<ED>): Promise<MigrationSchema<ED>>;
+export declare function inspectPostgreSqlSchema<ED extends PostgreSqlMigrationEntityDict>(connector: PostgreSQLConnector, translator: PostgreSQLTranslator<ED>): Promise<SchemaInspectionResult<ED>>;
+export declare function buildPostgreSqlMigrationPlan<ED extends PostgreSqlMigrationEntityDict>(currentSchema: MigrationSchema<ED>, targetSchema: MigrationSchema<ED>, translator: PostgreSQLTranslator<ED>, options?: MigrationPlanningOptions): Plan<ED>;
+export {};