From ea528abc3d45f3ceea96e0c440cf117b2d872138 Mon Sep 17 00:00:00 2001
From: thomashii <thomashii@dukefirehawk.com>
Date: Sat, 6 Jan 2024 18:33:09 +0800
Subject: [PATCH] Updated to postgres 3

---
 .vscode/settings.json                         |   4 +-
 logo_icon_512.jpg                             | Bin 0 -> 23116 bytes
 packages/orm/angel_orm_postgres/CHANGELOG.md  |   6 +-
 .../orm/angel_orm_postgres/example/main.dart  |   1 -
 .../lib/src/orm_postgres.dart                 | 193 +++++-------------
 packages/orm/angel_orm_postgres/pubspec.yaml  |   6 +-
 .../orm/angel_orm_postgres/test/common.dart   |  15 +-
 7 files changed, 63 insertions(+), 162 deletions(-)
 create mode 100644 logo_icon_512.jpg

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4e5534bc..5934a199 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,7 +12,7 @@
       "js": []
     },
     "editor.codeActionsOnSave": {
-      "source.fixAll.markdownlint": true
-  },
+      "source.fixAll.markdownlint": "explicit"
+    },
   "cmake.configureOnOpen": false
 }
\ No newline at end of file
diff --git a/logo_icon_512.jpg b/logo_icon_512.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3dc373e86496f98c9082ba5a4e5f82dc93057fd5
GIT binary patch
literal 23116
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
KO?<>Y_x%-4zVa;q

literal 0
HcmV?d00001

diff --git a/packages/orm/angel_orm_postgres/CHANGELOG.md b/packages/orm/angel_orm_postgres/CHANGELOG.md
index 9adb0f70..1fe2b716 100644
--- a/packages/orm/angel_orm_postgres/CHANGELOG.md
+++ b/packages/orm/angel_orm_postgres/CHANGELOG.md
@@ -1,11 +1,9 @@
 # Change Log
 
-## 8.1.1
-
-* Updated repository link
-
 ## 8.1.0
 
+* Updated repository links
+* Updated `postgres` to 3.0.0
 * Updated `lints` to 3.0.0
 * Fixed linter warnings
 
diff --git a/packages/orm/angel_orm_postgres/example/main.dart b/packages/orm/angel_orm_postgres/example/main.dart
index 039d097a..1dcf0be8 100644
--- a/packages/orm/angel_orm_postgres/example/main.dart
+++ b/packages/orm/angel_orm_postgres/example/main.dart
@@ -1,6 +1,5 @@
 import 'dart:io';
 import 'package:angel3_orm_postgres/angel3_orm_postgres.dart';
-import 'package:postgres_pool/postgres_pool.dart';
 
 void main() async {
   var executor = PostgreSqlPoolExecutor(PgPool(
diff --git a/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart b/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart
index f84e0345..24b30f4a 100644
--- a/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart
+++ b/packages/orm/angel_orm_postgres/lib/src/orm_postgres.dart
@@ -2,40 +2,46 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:angel3_orm/angel3_orm.dart';
 import 'package:logging/logging.dart';
-import 'package:pool/pool.dart';
 import 'package:postgres/postgres.dart';
 
 /// A [QueryExecutor] that queries a PostgreSQL database.
 class PostgreSqlExecutor extends QueryExecutor {
-  PostgreSQLExecutionContext _connection;
+  final Dialect _dialect = const PostgreSQLDialect();
+
+  ConnectionSettings? _settings;
+  Endpoint? _endpoint;
+
+  Session _session;
 
   /// An optional [Logger] to print information to. A default logger will be used
   /// if not set
   late Logger logger;
 
-  PostgreSqlExecutor(this._connection, {Logger? logger}) {
-    this.logger = logger ?? Logger('PostgreSqlExecutor');
-  }
-
-  final Dialect _dialect = const PostgreSQLDialect();
-
   @override
   Dialect get dialect => _dialect;
 
-  /// The underlying connection.
-  PostgreSQLExecutionContext get connection => _connection;
+  /// The underlying database session.
+  Session get session => _session;
+
+  PostgreSqlExecutor(this._session,
+      {Endpoint? endpoint, ConnectionSettings? settings, Logger? logger}) {
+    this.logger = logger ?? Logger('PostgreSqlExecutor');
+
+    _settings = settings;
+    _endpoint = endpoint;
+  }
 
   /// Closes the connection.
-  Future close() {
-    if (_connection is PostgreSQLConnection) {
-      return (_connection as PostgreSQLConnection).close();
-    } else {
-      return Future.value();
+  Future<void> close() async {
+    if (_session is Connection) {
+      await (_session as Connection).close();
     }
+
+    return Future.value();
   }
 
   @override
-  Future<PostgreSQLResult> query(
+  Future<Result> query(
       String tableName, String query, Map<String, dynamic> substitutionValues,
       {String returningQuery = '', List<String> returningFields = const []}) {
     if (returningFields.isNotEmpty) {
@@ -44,8 +50,8 @@ class PostgreSqlExecutor extends QueryExecutor {
       query = '$query $returning';
     }
 
-    //logger.fine('Query: $query');
-    //logger.fine('Values: $substitutionValues');
+    logger.fine('Query: $query');
+    logger.fine('Values: $substitutionValues');
 
     // Convert List into String
     var param = <String, dynamic>{};
@@ -57,28 +63,24 @@ class PostgreSqlExecutor extends QueryExecutor {
       }
     });
 
-    return _connection
-        .query(query, substitutionValues: param)
+    return _session
+        .execute(Sql.named(query), parameters: param)
         .catchError((err) async {
       logger.warning(err);
-      if (err is PostgreSQLException) {
+      if (err is PgException) {
         // This is a hack to detect broken db connection
-        bool brokenConnection =
-            err.message?.contains("connection is not open") ?? false;
+        bool brokenConnection = err.message.contains("connection is not open");
         if (brokenConnection) {
-          if (_connection is PostgreSQLConnection) {
-            // Open a new db connection
-            var currentConnection = _connection as PostgreSQLConnection;
-            currentConnection.close();
+          // Open a new db session
+          if (_session is Connection) {
+            (_session as Connection).close();
 
             logger.warning(
                 "A broken database connection is detected. Creating a new database connection.");
-            var conn = _createNewConnection(currentConnection);
-            await conn.open();
-            _connection = conn;
+            _session = await _createNewSession();
 
             // Retry the query with the new db connection
-            return _connection.query(query, substitutionValues: param);
+            return _session.execute(Sql.named(query), parameters: param);
           }
         }
       }
@@ -86,129 +88,36 @@ class PostgreSqlExecutor extends QueryExecutor {
     });
   }
 
-  // Create a new database connection from an existing connection
-  PostgreSQLConnection _createNewConnection(PostgreSQLConnection conn) {
-    return PostgreSQLConnection(conn.host, conn.port, conn.databaseName,
-        username: conn.username,
-        password: conn.password,
-        useSSL: conn.useSSL,
-        timeZone: conn.timeZone,
-        timeoutInSeconds: conn.timeoutInSeconds);
+  // Create a new database connection
+  Future<Session> _createNewSession() async {
+    if (_endpoint != null) {
+      return await Connection.open(_endpoint!, settings: _settings);
+    }
+
+    throw PgException("Unable to create new connection");
   }
 
   @override
   Future<T> transaction<T>(FutureOr<T> Function(QueryExecutor) f) async {
-    if (_connection is! PostgreSQLConnection) {
-      return await f(this);
-    }
+    //if (_connection is! PostgreSQLConnection) {
+    //  return await f(this);
+    //}
 
-    var conn = _connection as PostgreSQLConnection;
-    T? returnValue;
+    var conn = _session as Connection;
 
-    var txResult = await conn.transaction((ctx) async {
+    return await conn.runTx((ctx) async {
       try {
         //logger.fine('Entering transaction');
         var tx = PostgreSqlExecutor(ctx, logger: logger);
-        returnValue = await f(tx);
-
-        return returnValue;
+        return await f(tx);
       } catch (e) {
-        ctx.cancelTransaction(reason: e.toString());
+        ctx.rollback();
+        //ctx.cancelTransaction(reason: e.toString());
+        logger.warning("The transation has failed due to ", e);
         rethrow;
       }
-    });
-
-    if (txResult is PostgreSQLRollback) {
-      //if (txResult.reason == null) {
-      //  throw StateError('The transaction was cancelled.');
-      //} else {
-      throw StateError(
-          'The transaction was cancelled with reason "${txResult.reason}".');
-      //}
-    } else {
-      return returnValue!;
-    }
-  }
-}
-
-/// A [QueryExecutor] that manages a pool of PostgreSQL connections.
-class PostgreSqlExecutorPool extends QueryExecutor {
-  /// The maximum amount of concurrent connections.
-  final int size;
-
-  /// Creates a new [PostgreSQLConnection], on demand.
-  ///
-  /// The created connection should **not** be open.
-  final PostgreSQLConnection Function() connectionFactory;
-
-  /// An optional [Logger] to print information to.
-  late Logger logger;
-
-  final List<PostgreSqlExecutor> _connections = [];
-  int _index = 0;
-  final Pool _pool, _connMutex = Pool(1);
-
-  PostgreSqlExecutorPool(this.size, this.connectionFactory, {Logger? logger})
-      : _pool = Pool(size) {
-    if (logger != null) {
-      this.logger = logger;
-    } else {
-      this.logger = Logger('PostgreSqlExecutorPool');
-    }
-
-    assert(size > 0, 'Connection pool cannot be empty.');
-  }
-
-  final Dialect _dialect = const PostgreSQLDialect();
-
-  @override
-  Dialect get dialect => _dialect;
-
-  /// Closes all connections.
-  Future close() async {
-    await _pool.close();
-    await _connMutex.close();
-    return Future.wait(_connections.map((c) => c.close()));
-  }
-
-  Future _open() async {
-    if (_connections.isEmpty) {
-      _connections.addAll(await Future.wait(List.generate(size, (_) async {
-        //logger.fine('Spawning connections...');
-        var conn = connectionFactory();
-        await conn.open();
-        //return conn
-        //    .open()
-        //    .then((_) => PostgreSqlExecutor(conn, logger: logger));
-        return PostgreSqlExecutor(conn, logger: logger);
-      })));
-    }
-  }
-
-  Future<PostgreSqlExecutor> _next() {
-    return _connMutex.withResource(() async {
-      await _open();
-      if (_index >= size) _index = 0;
-      return _connections[_index++];
-    });
-  }
-
-  @override
-  Future<PostgreSQLResult> query(
-      String tableName, String query, Map<String, dynamic> substitutionValues,
-      {String returningQuery = '', List<String> returningFields = const []}) {
-    return _pool.withResource(() async {
-      var executor = await _next();
-      return executor.query(tableName, query, substitutionValues,
-          returningFields: returningFields);
-    });
-  }
-
-  @override
-  Future<T> transaction<T>(FutureOr<T> Function(QueryExecutor) f) {
-    return _pool.withResource(() async {
-      var executor = await _next();
-      return executor.transaction(f);
+    }).onError((error, stackTrace) {
+      throw StateError('The transaction was cancelled.');
     });
   }
 }
diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml
index c2d12e87..d8a77255 100644
--- a/packages/orm/angel_orm_postgres/pubspec.yaml
+++ b/packages/orm/angel_orm_postgres/pubspec.yaml
@@ -1,17 +1,15 @@
 name: angel3_orm_postgres
-version: 8.1.1
+version: 8.1.0
 description: PostgreSQL support for Angel3 ORM. Includes functionality for querying and transactions.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dart-backend/angel/tree/master/packages/orm/angel_orm_postgres
-publish_to: none
 environment:
   sdk: '>=3.0.0 <4.0.0'
 dependencies:
   angel3_orm: ^8.0.0
   logging: ^1.2.0
   pool: ^1.5.0
-  postgres: ^2.6.1
-  postgres_pool: ^2.1.6
+  postgres: ^3.0.0
 dev_dependencies:
   belatuk_pretty_logging: ^6.1.0
   angel3_orm_generator: ^8.0.0
diff --git a/packages/orm/angel_orm_postgres/test/common.dart b/packages/orm/angel_orm_postgres/test/common.dart
index 2b80ec42..a3ecb299 100644
--- a/packages/orm/angel_orm_postgres/test/common.dart
+++ b/packages/orm/angel_orm_postgres/test/common.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:angel3_orm/angel3_orm.dart';
 import 'package:angel3_orm_postgres/angel3_orm_postgres.dart';
 import 'package:logging/logging.dart';
-import 'package:postgres_pool/postgres_pool.dart';
+import 'package:postgres/postgres.dart';
 
 FutureOr<QueryExecutor> Function() pg(Iterable<String> schemas) {
   // Use single connection
@@ -19,19 +19,16 @@ FutureOr<QueryExecutor> Function() pg(Iterable<String> schemas) {
 Future<void> closePg(QueryExecutor executor) async {
   if (executor is PostgreSqlExecutor) {
     await executor.close();
-    //} else if (executor is PostgreSqlExecutorPool) {
-    //  await executor.close();
-  } else if (executor is PostgreSqlPoolExecutor) {
-    await executor.close();
   }
 }
 
 Future<PostgreSqlExecutor> connectToPostgres(Iterable<String> schemas) async {
-  var conn = PostgreSQLConnection(
-      'localhost', 5432, Platform.environment['POSTGRES_DB'] ?? 'orm_test',
+  var conn = await Connection.open(Endpoint(
+      host: 'localhost',
+      port: 5432,
+      database: Platform.environment['POSTGRES_DB'] ?? 'orm_test',
       username: Platform.environment['POSTGRES_USERNAME'] ?? 'test',
-      password: Platform.environment['POSTGRES_PASSWORD'] ?? 'test123');
-  await conn.open();
+      password: Platform.environment['POSTGRES_PASSWORD'] ?? 'test123'));
 
   // Run sql to create the tables
   for (var s in schemas) {