Merge with develop, and delete database_factory_ext.dart that's no us…

…ed in sqflite_database_factory.dart
pinchbv · Mar 15, 2024 · 88f64b6 · 88f64b6
1 parent b7a3a62
commit 88f64b6
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 108 deletions.
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -223,6 +223,13 @@ packages:
       relative: true
     source: path
     version: "1.4.2"
+  floor_common:
+    dependency: transitive
+    description:
+      path: "../floor_common"
+      relative: true
+    source: path
+    version: "1.2.0"
   floor_generator:
     dependency: "direct dev"
     description:
@@ -489,10 +496,10 @@ packages:
     dependency: transitive
     description:
       name: sqlparser
-      sha256: dc384bb1f56d1384ce078edb5ff8247976abdab79d0c83e437210c85f06ecb61
+      sha256: "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.34.0"
+    version: "0.34.1"
   stack_trace:
     dependency: transitive
     description:
@@ -529,10 +536,10 @@ packages:
     dependency: transitive
     description:
       name: strings
-      sha256: "1f3db7347b8dfd9844ee7fb34883cffbe6cc723a63cb9f4a0aa19e619304b030"
+      sha256: b33f40c4dd3e597bf6d9e7f4f4dc282dad0f19b07d9f320cb5c2183859cbccf5
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.1"
   synchronized:
     dependency: transitive
     description:

diff --git a/floor/pubspec.lock b/floor/pubspec.lock
@@ -216,6 +216,13 @@ packages:
       relative: true
     source: path
     version: "1.4.2"
+  floor_common:
+    dependency: "direct main"
+    description:
+      path: "../floor_common"
+      relative: true
+    source: path
+    version: "1.2.0"
   floor_generator:
     dependency: "direct dev"
     description:
@@ -301,26 +308,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: cdd14e3836065a1f6302a236ec8b5f700695c803c57ae11a1c84df31e6bcf831
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.3"
+    version: "10.0.0"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "9b2ef90589911d665277464e0482b209d39882dffaaf4ef69a3561a3354b2ebc"
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "2.0.1"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: fd3cd66cb2bcd7b50dcd3b413af49d78051f809c8b3f6e047962765c15a0d23d
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "2.0.1"
   lists:
     dependency: transitive
     description:
@@ -554,10 +561,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.6.1"
   timing:
     dependency: transitive
     description:
@@ -594,10 +601,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
       url: "https://pub.dev"
     source: hosted
-    version: "14.0.0"
+    version: "13.0.0"
   watcher:
     dependency: transitive
     description:
@@ -624,4 +631,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=3.2.6 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
+  flutter: ">=3.7.0"
diff --git a/floor/pubspec.yaml b/floor/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   path: ^1.9.0
   sqflite: ^2.3.2
   sqflite_common_ffi: ^2.3.2+1
-  sqlparser: ^0.34.0
+  sqlparser: ^0.34.1
 
 dev_dependencies:
   build_runner: ^2.4.8

diff --git a/floor_common/lib/floor_common.dart b/floor_common/lib/floor_common.dart
@@ -8,5 +8,4 @@ export 'package:floor_common/src/adapter/query_adapter.dart';
 export 'package:floor_common/src/adapter/update_adapter.dart';
 export 'package:floor_common/src/callback.dart';
 export 'package:floor_common/src/database.dart';
-export 'package:floor_common/src/database_factory_ext.dart';
 export 'package:floor_common/src/migration.dart';
diff --git a/floor_common/lib/src/database_factory_ext.dart b/floor_common/lib/src/database_factory_ext.dart