Resolve merge conflicts.

JanezStupar · Feb 27, 2024 · 074e695 · 074e695
2 parents 27f1d59 + 1e417fc
commit 074e695
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ## 0.1.3
 Fix edge case when INSERT SELECT statements contain literals.
 
+## 0.1.3
+Bump dependencies
+
 ## 0.1.2
 Records flagged as deleted are not modified again when a delete query targeting them is executed.
 

diff --git a/lib/src/crdt_util.dart b/lib/src/crdt_util.dart
@@ -121,8 +121,8 @@ class CrdtArgParser {
           ref = element;
         }
         if (ref.columnName == name) {
-          if (ref.parent is SetComponent) {
-            final parent = ref.parent as SetComponent;
+          if (ref.parent is SingleColumnSetComponent) {
+            final parent = ref.parent as SingleColumnSetComponent;
             if (parent.expression is NumberedVariable) {
               final numbered = parent.expression as NumberedVariable;
               if (numbered.explicitIndex != null) {
@@ -233,22 +233,25 @@ class CrdtUtil {
     set = argParser.fromIterable(
         'hlc',
         set,
-        (SetComponent element) => element.column.columnName == 'hlc',
-        (listLength) => SetComponent(
+        <SingleColumnSetComponent>(element) =>
+            element.column.columnName == 'hlc',
+        (listLength) => SingleColumnSetComponent(
             column: Reference(columnName: 'hlc'),
             expression: NumberedVariable(listLength)));
     set = argParser.fromIterable(
         'node_id',
         set,
-        (SetComponent element) => element.column.columnName == 'node_id',
-        (listLength) => SetComponent(
+        <SingleColumnSetComponent>(element) =>
+            element.column.columnName == 'node_id',
+        (listLength) => SingleColumnSetComponent(
             column: Reference(columnName: 'node_id'),
             expression: NumberedVariable(listLength)));
     set = argParser.fromIterable(
         'modified',
         set,
-        (SetComponent element) => element.column.columnName == 'modified',
-        (listLength) => SetComponent(
+        <SingleColumnSetComponent>(element) =>
+            element.column.columnName == 'modified',
+        (listLength) => SingleColumnSetComponent(
             column: Reference(columnName: 'modified'),
             expression: NumberedVariable(listLength)));
 
@@ -314,19 +317,19 @@ class CrdtUtil {
       withClause: statement.withClause,
       table: statement.table,
       set: [
-        SetComponent(
+        SingleColumnSetComponent(
           column: Reference(columnName: 'is_deleted'),
           expression: NumberedVariable(argCount + 1),
         ),
-        SetComponent(
+        SingleColumnSetComponent(
           column: Reference(columnName: 'hlc'),
           expression: NumberedVariable(argCount + 2),
         ),
-        SetComponent(
+        SingleColumnSetComponent(
           column: Reference(columnName: 'node_id'),
           expression: NumberedVariable(argCount + 3),
         ),
-        SetComponent(
+        SingleColumnSetComponent(
           column: Reference(columnName: 'modified'),
           expression: NumberedVariable(argCount + 4),
         ),
@@ -436,22 +439,25 @@ class CrdtUtil {
         action.set = argParser.fromIterable(
             'hlc',
             action.set,
-            (SetComponent element) => element.column.columnName == 'hlc',
-            (listLength) => SetComponent(
+            <SingleColumnSetComponent>(element) =>
+                element.column.columnName == 'hlc',
+            (listLength) => SingleColumnSetComponent(
                 column: Reference(columnName: 'hlc'),
                 expression: NumberedVariable(listLength)));
         action.set = argParser.fromIterable(
             'node_id',
             action.set,
-            (SetComponent element) => element.column.columnName == 'node_id',
-            (listLength) => SetComponent(
+            <SingleColumnSetComponent>(element) =>
+                element.column.columnName == 'node_id',
+            (listLength) => SingleColumnSetComponent(
                 column: Reference(columnName: 'node_id'),
                 expression: NumberedVariable(listLength)));
         action.set = argParser.fromIterable(
             'modified',
             action.set,
-            (SetComponent element) => element.column.columnName == 'modified',
-            (listLength) => SetComponent(
+            <SingleColumnSetComponent>(element) =>
+                element.column.columnName == 'modified',
+            (listLength) => SingleColumnSetComponent(
                 column: Reference(columnName: 'modified'),
                 expression: NumberedVariable(listLength)));
       }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: synchroflite
 description: Dart implementation of Conflict-free Replicated Data Types (CRDTs) using Sqlite
-version: 0.1.3
+version: 0.1.4
 homepage: https://github.com/JanezStupar/synchroflite
 repository: https://github.com/JanezStupar/synchroflite.git
 issue_tracker: https://github.com/JanezStupar/synchroflite/issues
@@ -12,9 +12,9 @@ dependencies:
   sqflite_common: ^2.5.0
   sqflite_common_ffi: ^2.3.0+2
   sqflite_common_ffi_web: ^0.4.0
-  sql_crdt: ^2.1.4
+  sql_crdt: ^2.1.6
   json_annotation: ^4.8.1
-  sqlparser: ^0.32.0
+  sqlparser: ^0.34.0
   source_span: ^1.10.0
   collection: ^1.17.2