Update postgres_crdt dependency

cachapa · Nov 27, 2023 · 2102cf9 · 2102cf9
1 parent 0cbb6f0
commit 2102cf9
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 51 deletions.
diff --git a/lib/tudo_server.dart b/lib/tudo_server.dart
@@ -17,34 +17,34 @@ import 'extensions.dart';
 
 Map<String, Query> _queries(String userId) => {
       'users': '''
-    SELECT users.id, users.name, users.is_deleted, users.hlc FROM
-      (SELECT user_id, max(created_at) AS created_at FROM
-        (SELECT list_id FROM user_lists WHERE user_id = ?1 AND is_deleted = 0) AS list_ids
-        JOIN user_lists ON user_lists.list_id = list_ids.list_id
-        GROUP BY user_lists.user_id
-      ) AS user_ids
-    JOIN users ON users.id = user_ids.user_id
-  ''',
+        SELECT users.id, users.name, users.is_deleted, users.hlc FROM
+          (SELECT user_id, max(created_at) AS created_at FROM
+            (SELECT list_id FROM user_lists WHERE user_id = ?1 AND is_deleted = 0) AS list_ids
+            JOIN user_lists ON user_lists.list_id = list_ids.list_id
+            GROUP BY user_lists.user_id
+          ) AS user_ids
+        JOIN users ON users.id = user_ids.user_id
+      ''',
       'user_lists': '''
-    SELECT user_lists.list_id, user_id, position, user_lists.created_at, is_deleted, hlc FROM
-      (SELECT list_id, created_at FROM user_lists WHERE user_id = ?1) AS own_lists
-    JOIN user_lists ON own_lists.list_id = user_lists.list_id
-  ''',
+        SELECT user_lists.list_id, user_id, position, user_lists.created_at, is_deleted, hlc FROM
+          (SELECT list_id, created_at FROM user_lists WHERE user_id = ?1) AS own_lists
+        JOIN user_lists ON own_lists.list_id = user_lists.list_id
+      ''',
       'lists': '''
-    SELECT * FROM (SELECT lists.id, lists.name, lists.color, lists.creator_id,
-      lists.created_at, lists.is_deleted, lists.hlc, lists.node_id,
-      CASE WHEN lists.modified > user_lists.modified THEN lists.modified ELSE user_lists.modified END AS modified
-    FROM user_lists
-    JOIN lists ON list_id = lists.id AND user_id = ?1 AND user_lists.is_deleted = 0) a
-  ''',
+        SELECT * FROM (SELECT lists.id, lists.name, lists.color, lists.creator_id,
+          lists.created_at, lists.is_deleted, lists.hlc, lists.node_id,
+          CASE WHEN lists.modified > user_lists.modified THEN lists.modified ELSE user_lists.modified END AS modified
+        FROM user_lists
+        JOIN lists ON list_id = lists.id AND user_id = ?1 AND user_lists.is_deleted = 0) a
+      ''',
       'todos': '''
-    SELECT * FROM (SELECT todos.id, todos.list_id, todos.name, todos.done, todos.position,
-      todos.creator_id, todos.created_at, todos.done_at, todos.done_by,
-      todos.is_deleted, todos.hlc, todos.node_id,
-      CASE WHEN todos.modified > user_lists.modified THEN todos.modified ELSE user_lists.modified END AS modified
-      FROM user_lists
-    JOIN todos ON user_lists.list_id = todos.list_id AND user_id = ?1 AND user_lists.is_deleted = 0) a
-  ''',
+        SELECT * FROM (SELECT todos.id, todos.list_id, todos.name, todos.done, todos.position,
+          todos.creator_id, todos.created_at, todos.done_at, todos.done_by,
+          todos.is_deleted, todos.hlc, todos.node_id,
+          CASE WHEN todos.modified > user_lists.modified THEN todos.modified ELSE user_lists.modified END AS modified
+          FROM user_lists
+        JOIN todos ON user_lists.list_id = todos.list_id AND user_id = ?1 AND user_lists.is_deleted = 0) a
+      ''',
     }.map((table, sql) => MapEntry(table, (sql, [userId])));
 
 // Maximum time clients can remain connected without activity
@@ -73,6 +73,7 @@ class TudoServer {
         port: dbPort,
         username: dbUsername,
         password: dbPassword,
+        sslMode: SslMode.disable,
       );
     } catch (e) {
       print('Failed to open Postgres database.');
@@ -223,7 +224,6 @@ class TudoServer {
     // Close stale connections
     _connectedClients.forEach((client, lastAccess) {
       final idleTime = now.difference(lastAccess);
-      print('idle time: ${idleTime.inSeconds}');
       if (idleTime > maxIdleDuration) {
         print('Closing idle client: (${syncClient.peerId!.short})');
         client.close();

diff --git a/pubspec.lock b/pubspec.lock
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb"
+      sha256: ac86d3abab0f165e4b8f561280ff4e066bceaac83c424dd19f1ae2c2fcd12ca9
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.4"
+    version: "1.7.1"
   crdt:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: "38dce67ce909c338754840e2a1479c2c11347a2fc7ec3d5b166a5118a8a201db"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   http_methods:
     dependency: transitive
     description:
@@ -181,10 +181,10 @@ packages:
     dependency: "direct dev"
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
   logging:
     dependency: transitive
     description:
@@ -261,18 +261,18 @@ packages:
     dependency: transitive
     description:
       name: postgres
-      sha256: fce8406bbe8b7018c768e76816be24adf302f44c06d7176c912d2501ea6aac2a
+      sha256: b019d64aa7191da978e73e53f59743723514c6f01ebbb5e917aed64d484b10e3
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.3"
+    version: "3.0.1"
   postgres_crdt:
     dependency: "direct main"
     description:
       name: postgres_crdt
-      sha256: "42c1fa401e12f5caceb56bc8b7a0df31e3b74e218ca60c30ce52e648beeabcbf"
+      sha256: a46ffd6df2a0ca97d7c02f6c94d3415e20605a4fff5bf3da8f202d16a24e8830
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   pub_semver:
     dependency: transitive
     description:
@@ -381,18 +381,18 @@ packages:
     dependency: transitive
     description:
       name: sql_crdt
-      sha256: ede3eaaf8a36bf0c2c372ccb7dbc59c5f8f6779bb2159bc2c9f0d517cd2f7b7e
+      sha256: e226ec9c557402c1e749f16b1cc04f6a7cc6a74a7ba96e1501b108ead8a59680
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5+1"
   sqlparser:
     dependency: transitive
     description:
       name: sqlparser
-      sha256: "76cffcc0c9fab85557758bd8ebccaa332586e0aa6cf6cd6fcb249b7c0f42ed66"
+      sha256: db6354e8ba71acc50bc4afeafff2a248710ae2c00c9412e2c8b796916d4b1c45
       url: "https://pub.dev"
     source: hosted
-    version: "0.32.0"
+    version: "0.32.1"
   stack_trace:
     dependency: transitive
     description:
@@ -429,10 +429,10 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: a20ddc0723556dc6dd56094e58ec1529196d5d7774156604cb14e8445a5a82ff
+      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
       url: "https://pub.dev"
     source: hosted
-    version: "1.24.7"
+    version: "1.24.9"
   test_api:
     dependency: transitive
     description:
@@ -445,10 +445,10 @@ packages:
     dependency: transitive
     description:
       name: test_core
-      sha256: "96382d0bc826e260b077bb496259e58bc82e90b603ab16cd5ae95dfe1dfcba8b"
+      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.7"
+    version: "0.5.9"
   typed_data:
     dependency: transitive
     description:
@@ -469,10 +469,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7
+      sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.2.1"
   version:
     dependency: "direct main"
     description:
@@ -485,10 +485,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: a13d5503b4facefc515c8c587ce3cf69577a7b064a9f1220e005449cf1f64aad
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.0"
+    version: "13.0.0"
   watcher:
     dependency: transitive
     description:
@@ -497,6 +497,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   web_socket_channel:
     dependency: "direct main"
     description:
@@ -522,4 +530,4 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.2.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -10,8 +10,8 @@ dependencies:
   args: ^2.4.2
   crdt_sync: ^1.0.9
 #    path: ../../crdt/crdt_sync
-  http: ^1.1.0
-  postgres_crdt: ^2.1.4
+  http: ^1.1.1
+  postgres_crdt: ^2.1.5
 #    path: ../../crdt/postgres_crdt
   rxdart: ^0.27.7
   shelf: ^1.4.1