feat: Migrate to postgres v3

Oberhauser-Dev · Jan 21, 2024 · c015233 · c015233
1 parent e39198d
commit c015233
Show file tree

Hide file tree

Showing 16 changed files with 157 additions and 115 deletions.
diff --git a/wrestling_scoreboard_server/lib/controllers/bout_action_controller.dart b/wrestling_scoreboard_server/lib/controllers/bout_action_controller.dart
@@ -1,5 +1,5 @@
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:postgres/postgres.dart';
+import 'package:postgres/postgres.dart' as psql;
 
 import 'entity_controller.dart';
 
@@ -13,9 +13,9 @@ class BoutActionController extends EntityController<BoutAction> {
   BoutActionController._internal() : super(tableName: 'bout_action');
 
   @override
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() {
+  Map<String, psql.Type?> getPostgresDataTypes() {
     return {
-      'point_count': PostgreSQLDataType.smallInteger,
+      'point_count': psql.Type.smallInteger,
       'bout_role': null,
       'action_type': null,
     };

diff --git a/wrestling_scoreboard_server/lib/controllers/bout_config_controller.dart b/wrestling_scoreboard_server/lib/controllers/bout_config_controller.dart
@@ -1,5 +1,5 @@
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:postgres/postgres.dart';
+import 'package:postgres/postgres.dart' as psql;
 import 'package:wrestling_scoreboard_server/controllers/entity_controller.dart';
 
 class BoutConfigController extends EntityController<BoutConfig> {
@@ -12,9 +12,9 @@ class BoutConfigController extends EntityController<BoutConfig> {
   BoutConfigController._internal() : super(tableName: 'bout_config');
 
   @override
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() {
+  Map<String, psql.Type?> getPostgresDataTypes() {
     return {
-      'period_count': PostgreSQLDataType.smallInteger,
+      'period_count': psql.Type.smallInteger,
     };
   }
 }
diff --git a/wrestling_scoreboard_server/lib/controllers/bout_controller.dart b/wrestling_scoreboard_server/lib/controllers/bout_controller.dart
@@ -1,5 +1,5 @@
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:postgres/postgres.dart';
+import 'package:postgres/postgres.dart' as psql;
 import 'package:shelf/shelf.dart';
 
 import 'entity_controller.dart';
@@ -20,7 +20,7 @@ class BoutController extends EntityController<Bout> {
   }
 
   @override
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() {
+  Map<String, psql.Type?> getPostgresDataTypes() {
     return {
       'winner_role': null,
       'bout_result': null,

diff --git a/wrestling_scoreboard_server/lib/controllers/competition_controller.dart b/wrestling_scoreboard_server/lib/controllers/competition_controller.dart
@@ -1,5 +1,5 @@
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:postgres/postgres.dart';
+import 'package:postgres/postgres.dart' as psql;
 import 'package:shelf/shelf.dart';
 
 import 'entity_controller.dart';
@@ -24,7 +24,7 @@ class CompetitionController extends EntityController<Competition> {
   }
 
   @override
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() {
-    return {'comment': PostgreSQLDataType.text};
+  Map<String, psql.Type?> getPostgresDataTypes() {
+    return {'comment': psql.Type.text};
   }
 }
diff --git a/wrestling_scoreboard_server/lib/controllers/entity_controller.dart b/wrestling_scoreboard_server/lib/controllers/entity_controller.dart
@@ -1,12 +1,14 @@
 import 'dart:convert';
 
-import 'package:postgres/postgres.dart';
+import 'package:postgres/legacy.dart';
+import 'package:postgres/postgres.dart' as psql;
 import 'package:shelf/shelf.dart';
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:wrestling_scoreboard_server/controllers/bout_config_controller.dart';
-import 'package:wrestling_scoreboard_server/controllers/club_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/bout_action_controller.dart';
+import 'package:wrestling_scoreboard_server/controllers/bout_config_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/bout_controller.dart';
+import 'package:wrestling_scoreboard_server/controllers/club_controller.dart';
+import 'package:wrestling_scoreboard_server/controllers/competition_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/league_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/league_team_participation_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/league_weight_class_controller.dart';
@@ -16,42 +18,41 @@ import 'package:wrestling_scoreboard_server/controllers/participant_state_contro
 import 'package:wrestling_scoreboard_server/controllers/participation_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/person_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/team_controller.dart';
-import 'package:wrestling_scoreboard_server/controllers/team_match_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/team_match_bout_controller.dart';
-import 'package:wrestling_scoreboard_server/controllers/competition_controller.dart';
+import 'package:wrestling_scoreboard_server/controllers/team_match_controller.dart';
 import 'package:wrestling_scoreboard_server/controllers/websocket_handler.dart';
 import 'package:wrestling_scoreboard_server/controllers/weight_class_controller.dart';
 import 'package:wrestling_scoreboard_server/services/postgres_db.dart';
 
-Map<Type, PostgreSQLDataType> typeDartToCodeMap = {
-  String: PostgreSQLDataType.varChar,
-  // 'int2': PostgreSQLDataType.smallInteger,
-  int: PostgreSQLDataType.integer,
-  // 'int8': PostgreSQLDataType.bigInteger,
-  // 'float4': PostgreSQLDataType.real,
-  double: PostgreSQLDataType.double,
-  bool: PostgreSQLDataType.boolean,
-  DateTime: PostgreSQLDataType.date,
-  // 'timestamp': PostgreSQLDataType.timestampWithoutTimezone,
-  // 'timestamptz': PostgreSQLDataType.timestampWithTimezone,
-  // 'interval': PostgreSQLDataType.interval,
-  PgPoint: PostgreSQLDataType.point,
-  // 'jsonb': PostgreSQLDataType.jsonb,
-  // 'bytea': PostgreSQLDataType.byteArray,
-  // 'name': PostgreSQLDataType.name,
-  // 'uuid': PostgreSQLDataType.uuid,
-  // 'json': PostgreSQLDataType.json,
-  // 'point': PostgreSQLDataType.point,
-  List<int>: PostgreSQLDataType.integerArray,
-  List<String>: PostgreSQLDataType.textArray,
-  List<double>: PostgreSQLDataType.doubleArray,
-  // 'varchar': PostgreSQLDataType.varChar,
-  // '_jsonb': PostgreSQLDataType.jsonbArray,
+Map<Type, psql.Type> typeDartToCodeMap = {
+  String: psql.Type.varChar,
+  // 'int2': psql.Type.smallInteger,
+  int: psql.Type.integer,
+  // 'int8': psql.Type.bigInteger,
+  // 'float4': psql.Type.real,
+  double: psql.Type.double,
+  bool: psql.Type.boolean,
+  DateTime: psql.Type.date,
+  // 'timestamp': psql.Type.timestampWithoutTimezone,
+  // 'timestamptz': psql.Type.timestampWithTimezone,
+  // 'interval': psql.Type.interval,
+  // PgPoint: psql.Type.point,
+  // 'jsonb': psql.Type.jsonb,
+  // 'bytea': psql.Type.byteArray,
+  // 'name': psql.Type.name,
+  // 'uuid': psql.Type.uuid,
+  // 'json': psql.Type.json,
+  // 'point': psql.Type.point,
+  List<int>: psql.Type.integerArray,
+  List<String>: psql.Type.textArray,
+  List<double>: psql.Type.doubleArray,
+  // 'varchar': psql.Type.varChar,
+  // '_jsonb': psql.Type.jsonbArray,
 };
 
 class PostgresMap {
   Map<String, dynamic> map;
-  Map<String, PostgreSQLDataType?> types;
+  Map<String, psql.Type?> types;
 
   PostgresMap(this.map, [this.types = const {}]);
 }
@@ -83,13 +84,14 @@ abstract class EntityController<T extends DataObject> {
     return DataObject.fromRaw<T>(single, getSingleFromDataType);
   }
 
+  late final getSingleRawStmt =
+      PostgresDb().connection.prepare(psql.Sql.named('SELECT * FROM $tableName WHERE $primaryKeyName = @id;'));
+
   Future<Map<String, dynamic>?> getSingleRaw(int id) async {
-    final res = await PostgresDb()
-        .connection
-        .mappedResultsQuery('SELECT * FROM $tableName WHERE $primaryKeyName = @id;', substitutionValues: {'id': id});
-    final many = mapToTable(res);
-    if (many.isEmpty) return Future.value(null);
-    return many.first;
+    final res = (await getSingleRawStmt).bind({'id': id});
+    final many = res.toColumnMap();
+    if (await many.isEmpty) return Future.value(null);
+    return await many.first;
   }
 
   Future<int> createSingle(T dataObject) async {
@@ -104,19 +106,24 @@ abstract class EntityController<T extends DataObject> {
       final postgresType =
           postgresTypes.containsKey(e.key) ? postgresTypes[e.key] : typeDartToCodeMap[e.value.runtimeType];
       // Trim all strings before inserting into db
-      if (postgresType == PostgreSQLDataType.varChar || postgresType == PostgreSQLDataType.text) {
+      if (postgresType == psql.Type.varChar || postgresType == psql.Type.text) {
         data[e.key] = e.value != null ? (e.value as String).trim() : e.value;
       }
       return PostgreSQLFormat.id(e.key, type: postgresType);
     }).join(', ')}) RETURNING $primaryKeyName;
         ''';
     try {
-      final res = await PostgresDb().connection.query(sql, substitutionValues: data);
-      return res.last[0] as int;
-    } on PostgreSQLException catch (e) {
+      final stmt = await PostgresDb().connection.prepare(sql);
+      final res = stmt.bind(data);
+      if (await res.isEmpty || (await res.last).isEmpty) {
+        throw InvalidParameterException(
+            'The data object of table $tableName could not be updated. Check the attributes: $data');
+      }
+      return (await res.last)[0] as int;
+    } on psql.PgException catch (e) {
       throw InvalidParameterException(
           'The data object of table $tableName could not be created. Check the attributes: $data\n'
-          'PostgreSQLException: {"code": ${e.code}}');
+          'PgException: {"message": ${e.message}}');
     }
   }
 
@@ -132,33 +139,36 @@ abstract class EntityController<T extends DataObject> {
       final postgresType =
           postgresTypes.containsKey(e.key) ? postgresTypes[e.key] : typeDartToCodeMap[e.value.runtimeType];
       // Trim all strings before inserting into db
-      if (postgresType == PostgreSQLDataType.varChar || postgresType == PostgreSQLDataType.text) {
+      if (postgresType == psql.Type.varChar || postgresType == psql.Type.text) {
         data[e.key] = e.value != null ? (e.value as String).trim() : e.value;
       }
       return '${e.key} = ${PostgreSQLFormat.id(e.key, type: postgresType)}';
     }).join(',')} 
         WHERE $primaryKeyName = ${data[primaryKeyName]} RETURNING $primaryKeyName;
         ''';
     try {
-      final res = await PostgresDb().connection.query(sql, substitutionValues: data);
-      if (res.isEmpty || res.last.isEmpty) {
+      final stmt = await PostgresDb().connection.prepare(sql);
+      final res = stmt.bind(data);
+      if (await res.isEmpty || (await res.last).isEmpty) {
         throw InvalidParameterException(
             'The data object of table $tableName could not be updated. Check the attributes: $data');
       }
-      return res.last[0] as int;
-    } on PostgreSQLException catch (e) {
+      return (await res.last)[0] as int;
+    } on psql.PgException catch (e) {
       throw InvalidParameterException(
           'The data object of table $tableName could not be updated. Check the attributes: $data'
-          '\nPostgreSQLException: {"code": ${e.code}');
+          '\nPgException: {"message": ${e.message}');
     }
   }
 
+  late final deleteSingleStmt =
+      PostgresDb().connection.prepare(psql.Sql.named('DELETE FROM $tableName WHERE $primaryKeyName = @id;'));
+
   Future<bool> deleteSingle(int id) async {
     try {
-      await PostgresDb()
-          .connection
-          .query('DELETE FROM $tableName WHERE $primaryKeyName = @id;', substitutionValues: {'id': id});
-    } on PostgreSQLException catch (_) {
+      final res = (await deleteSingleStmt).bind({'id': id});
+      await res.drain();
+    } on psql.PgException catch (_) {
       return false;
     }
     return true;
@@ -182,7 +192,9 @@ abstract class EntityController<T extends DataObject> {
   }
 
   Future<void> setManyRawFromQuery(String sqlQuery, {Map<String, dynamic>? substitutionValues}) async {
-    await PostgresDb().connection.mappedResultsQuery(sqlQuery, substitutionValues: substitutionValues);
+    final stmt = await PostgresDb().connection.prepare(psql.Sql.named(sqlQuery));
+    final res = stmt.bind(substitutionValues);
+    return await res.drain();
   }
 
   Future<Response> requestMany(Request request) async {
@@ -220,8 +232,9 @@ abstract class EntityController<T extends DataObject> {
 
   Future<List<Map<String, dynamic>>> getManyRawFromQuery(String sqlQuery,
       {Map<String, dynamic>? substitutionValues}) async {
-    final res = await PostgresDb().connection.mappedResultsQuery(sqlQuery, substitutionValues: substitutionValues);
-    return mapToTable(res);
+    final stmt = await PostgresDb().connection.prepare(psql.Sql.named(sqlQuery));
+    final res = stmt.bind(substitutionValues);
+    return await res.toColumnMap().toList();
   }
 
   Future<List<T>> mapToEntity(List<Map<String, Map<String, dynamic>>> res) async {
@@ -231,18 +244,15 @@ abstract class EntityController<T extends DataObject> {
     }));
   }
 
-  List<Map<String, dynamic>> mapToTable(List<Map<String, Map<String, dynamic>>> res) {
-    return res.map((row) => row[tableName]!).toList();
-  }
-
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() => {};
+  Map<String, psql.Type?> getPostgresDataTypes() => {};
 
   bool isRaw(Request request) {
     return (request.url.queryParameters['isRaw'] ?? '').parseBool();
   }
 
-  static Future<Map<String, dynamic>> query(String sqlQuery, {Map<String, dynamic>? substitutionValues}) async {
-    return (await PostgresDb().connection.mappedResultsQuery(sqlQuery, substitutionValues: substitutionValues)).single;
+  static Future<Map<String, dynamic>> query(psql.Statement stmt, {Map<String, dynamic>? substitutionValues}) async {
+    final res = stmt.bind(substitutionValues);
+    return res.toColumnMap().single;
   }
 
   static Future<Response> handlePostSingleOfController(EntityController controller, Map<String, Object?> json) async {
@@ -315,8 +325,8 @@ abstract class EntityController<T extends DataObject> {
 
   static Future<List<T>> getManyFromDataType<T extends DataObject>(
       {List<String>? conditions, Conjunction conjunction = Conjunction.and, Map<String, dynamic>? substitutionValues}) {
-    return getControllerFromDataType<T>()
-        .getMany(conditions: conditions, conjunction: conjunction, substitutionValues: substitutionValues);
+    return getControllerFromDataType<T>().getMany(
+        conditions: conditions, conjunction: conjunction, substitutionValues: substitutionValues) as Future<List<T>>;
   }
 
   static EntityController<T> getControllerFromDataType<T extends DataObject>() {
@@ -371,3 +381,23 @@ class InvalidParameterException implements Exception {
 
   InvalidParameterException(this.message);
 }
+
+extension on Map<String, dynamic> {
+  /// Parse custom postgres types
+  /// https://github.com/isoos/postgresql-dart/issues/276
+  Map<String, dynamic> parse() {
+    return map((key, value) => MapEntry(key, value is psql.UndecodedBytes ? value.asString : value));
+  }
+}
+
+extension on psql.ResultStream {
+  /// Parse custom postgres types
+  /// https://github.com/isoos/postgresql-dart/issues/276
+  Stream<Iterable<dynamic>> parse() {
+    return map((row) => row.map((value) => value is psql.UndecodedBytes ? value.asString : value));
+  }
+
+  Stream<Map<String, dynamic>> toColumnMap() {
+    return map((row) => row.toColumnMap().parse());
+  }
+}
diff --git a/wrestling_scoreboard_server/lib/controllers/lineup_controller.dart b/wrestling_scoreboard_server/lib/controllers/lineup_controller.dart
@@ -1,5 +1,6 @@
-import 'package:wrestling_scoreboard_common/common.dart';
 import 'package:shelf/shelf.dart';
+import 'package:wrestling_scoreboard_common/common.dart';
+import 'package:wrestling_scoreboard_server/services/postgres_db.dart';
 
 import 'entity_controller.dart';
 import 'participation_controller.dart';
@@ -11,7 +12,7 @@ class LineupController extends EntityController<Lineup> {
     return _singleton;
   }
 
-  static final teamIdQuery = 'SELECT team_id FROM lineup WHERE id = @id';
+  static final teamIdStmt = PostgresDb().connection.prepare('SELECT team_id FROM lineup WHERE id = @id');
 
   LineupController._internal() : super(tableName: 'lineup');
 

diff --git a/wrestling_scoreboard_server/lib/controllers/participant_state_controller.dart b/wrestling_scoreboard_server/lib/controllers/participant_state_controller.dart
@@ -1,5 +1,5 @@
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:postgres/postgres.dart';
+import 'package:postgres/postgres.dart' as psql;
 
 import 'entity_controller.dart';
 
@@ -13,7 +13,7 @@ class ParticipantStateController extends EntityController<ParticipantState> {
   ParticipantStateController._internal() : super(tableName: 'participant_state');
 
   @override
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() {
-    return {'classification_points': PostgreSQLDataType.smallInteger};
+  Map<String, psql.Type?> getPostgresDataTypes() {
+    return {'classification_points': psql.Type.smallInteger};
   }
 }
diff --git a/wrestling_scoreboard_server/lib/controllers/participation_controller.dart b/wrestling_scoreboard_server/lib/controllers/participation_controller.dart
@@ -1,5 +1,5 @@
 import 'package:wrestling_scoreboard_common/common.dart';
-import 'package:postgres/postgres.dart';
+import 'package:postgres/postgres.dart' as psql;
 
 import 'entity_controller.dart';
 
@@ -13,7 +13,7 @@ class ParticipationController extends EntityController<Participation> {
   ParticipationController._internal() : super(tableName: 'participation');
 
   @override
-  Map<String, PostgreSQLDataType?> getPostgresDataTypes() {
-    return {'weight': PostgreSQLDataType.numeric};
+  Map<String, psql.Type?> getPostgresDataTypes() {
+    return {'weight': psql.Type.numeric};
   }
 }