Upstream changes

af6a7be7 - chore (drivers): extract drivers to a separate package (#1332)
2024-06-26 13:07:47 +0000 - Kevin
electric-sql/electric@af6a7be7

packages/electricsql/lib/drivers/drivers.dart

@@ -0,0 +1 @@
+export '../src/drivers/adapter.dart';

packages/electricsql/lib/src/client/model/client.dart

@@ -1,3 +1,4 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/electricsql.dart';
 import 'package:electricsql/src/client/model/sync.dart';
 import 'package:electricsql/src/client/model/transform.dart' as transform_lib;

packages/electricsql/lib/src/devtools/api/statements.dart

@@ -1,4 +1,4 @@
-import 'package:electricsql/electricsql.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/migrators.dart';
 import 'package:electricsql/src/devtools/shared.dart';
 import 'package:electricsql/util.dart';

packages/electricsql/lib/src/electric/adapter.dart → packages/electricsql/lib/src/drivers/adapter.dart

@@ -5,6 +5,8 @@ import 'package:electricsql/src/util/types.dart';
 // commit message: feat (client): flag to disable FKs on incoming TXs in SQLite
 // https://github.com/electric-sql/electric/commit/f4f020d97916dd975661ea56ac2e08df3a70fab1
 
+/// A `DatabaseAdapter` adapts a database client to provide the
+/// normalised interface defined here.
 abstract class DatabaseAdapter {
   //db: AnyDatabase
 

packages/electricsql/lib/src/drivers/drift/drift.dart

@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart' hide Migrator;
 import 'package:electricsql/drivers/drift.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/electricsql.dart';
 import 'package:electricsql/migrators.dart';
 import 'package:electricsql/src/client/model/client.dart';

packages/electricsql/lib/src/drivers/drift/drift_adapter.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:drift/drift.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/migrators.dart';
 import 'package:electricsql/src/client/conversions/postgres/mapping.dart'
     as pg_mapping;
 import 'package:electricsql/src/drivers/drift/drift.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/util/debug/debug.dart';
 import 'package:electricsql/src/util/types.dart';
 

packages/electricsql/lib/src/drivers/sqlite3/sqlite3_adapter.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/query_builder/builder.dart';
 import 'package:electricsql/src/util/types.dart';
 import 'package:sqlite3/sqlite3.dart' as sqlite;

packages/electricsql/lib/src/electric/electric.dart

@@ -1,3 +1,4 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/electricsql.dart';
 import 'package:electricsql/migrators.dart';
 import 'package:electricsql/notifiers.dart';

packages/electricsql/lib/src/electric/index.dart

@@ -1,4 +1,3 @@
-export 'adapter.dart';
 export 'electric.dart'
     show ElectrifyBaseOptions, ElectrifyOptions, electrifyBase;
 export 'namespace.dart' show ElectricNamespace;

packages/electricsql/lib/src/electric/mock.dart

@@ -1,5 +1,5 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/migrators.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/util/types.dart';
 
 class MockDatabaseAdapter implements DatabaseAdapter {

packages/electricsql/lib/src/electric/namespace.dart

@@ -1,3 +1,4 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/electricsql.dart';
 import 'package:electricsql/satellite.dart';
 import 'package:electricsql/src/devtools/devtools.dart' as devtools;

packages/electricsql/lib/src/migrators/bundle.dart

@@ -1,4 +1,4 @@
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/migrators/schema.dart';

packages/electricsql/lib/src/satellite/mock.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/auth/auth.dart';
 import 'package:electricsql/src/client/model/schema.dart' hide Relation;
 import 'package:electricsql/src/client/model/shapes.dart';
 import 'package:electricsql/src/config/config.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/notifiers/notifiers.dart';
 import 'package:electricsql/src/proto/satellite.pb.dart';

packages/electricsql/lib/src/satellite/process.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/auth/auth.dart';
 import 'package:electricsql/src/auth/secure.dart';
 import 'package:electricsql/src/client/model/shapes.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/migrators/triggers.dart';

packages/electricsql/lib/src/satellite/registry.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/client/model/schema.dart';
 import 'package:electricsql/src/config/config.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/notifiers/notifiers.dart';
 import 'package:electricsql/src/satellite/client.dart';

packages/electricsql/lib/src/satellite/satellite.dart

@@ -1,8 +1,8 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/auth/auth.dart';
 import 'package:electricsql/src/client/model/schema.dart';
 import 'package:electricsql/src/client/model/shapes.dart';
 import 'package:electricsql/src/config/config.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/notifiers/notifiers.dart';
 import 'package:electricsql/src/satellite/shapes/types.dart';

packages/electricsql/lib/src/util/relations.dart

@@ -1,4 +1,4 @@
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/proto/satellite.pb.dart';
 import 'package:electricsql/src/satellite/config.dart';

packages/electricsql/test/drivers/common.dart

@@ -1,4 +1,4 @@
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/util/types.dart';
 import 'package:meta/meta.dart';
 import 'package:sqlite3/sqlite3.dart';

packages/electricsql/test/drivers/drift_test.dart

@@ -4,7 +4,7 @@ import 'package:drift/backends.dart';
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:electricsql/drivers/drift.dart';
-import 'package:electricsql/electricsql.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/util/types.dart';
 import 'package:test/test.dart';
 

packages/electricsql/test/drivers/sqlite3_test.dart

@@ -1,5 +1,5 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/drivers/sqlite3/sqlite3_adapter.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/util/types.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:test/test.dart';

packages/electricsql/test/migrators/bundle.dart

@@ -1,4 +1,4 @@
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/bundle.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:meta/meta.dart';

packages/electricsql/test/migrators/postgres/bundle_test.dart

@@ -2,7 +2,7 @@
 library;
 
 import 'package:electricsql/drivers/drift.dart';
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/bundle.dart';
 import 'package:electricsql/src/util/random.dart';
 import 'package:test/test.dart';

packages/electricsql/test/migrators/postgres/schema_test.dart

@@ -2,7 +2,7 @@
 library;
 
 import 'package:electricsql/drivers/drift.dart';
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/bundle.dart';
 import 'package:electricsql/src/satellite/config.dart';
 import 'package:electricsql/src/util/random.dart';

packages/electricsql/test/migrators/postgres/triggers_test.dart

@@ -1,8 +1,8 @@
 @Tags(['postgres'])
 library;
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/drivers/drift/drift_adapter.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/migrators/triggers.dart';
 import 'package:electricsql/src/satellite/config.dart';

packages/electricsql/test/migrators/sqlite/bundle_test.dart

@@ -1,5 +1,5 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/drivers/sqlite3/sqlite3_adapter.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/bundle.dart';
 import 'package:electricsql/src/util/random.dart';
 import 'package:sqlite3/sqlite3.dart';

packages/electricsql/test/migrators/sqlite/schema_test.dart

@@ -1,5 +1,5 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/drivers/sqlite3/sqlite3_adapter.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/bundle.dart';
 import 'package:electricsql/src/satellite/config.dart';
 import 'package:electricsql/src/util/random.dart';

packages/electricsql/test/migrators/sqlite/triggers_test.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/drivers/sqlite3.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/migrators/triggers.dart';
 import 'package:electricsql/src/satellite/config.dart';

packages/electricsql/test/migrators/triggers.dart

@@ -1,4 +1,4 @@
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/migrators/triggers.dart';
 import 'package:electricsql/src/satellite/config.dart';

packages/electricsql/test/satellite/common.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:drift/drift.dart' show DatabaseConnectionUser;
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/electricsql.dart' hide Relation;
 import 'package:electricsql/migrators.dart';
 import 'package:electricsql/satellite.dart';

packages/electricsql/test/satellite/merge_test.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/drivers/sqlite3.dart';
 import 'package:electricsql/src/drivers/drift/drift_adapter.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/satellite/config.dart';
 import 'package:electricsql/src/satellite/merge.dart';

packages/electricsql/test/satellite/process.dart

@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/electricsql.dart';
 import 'package:electricsql/src/client/model/shapes.dart';
 import 'package:electricsql/src/migrators/migrators.dart';

packages/electricsql/test/satellite/process_migration.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/notifiers/mock.dart';

packages/electricsql/test/satellite/process_tags.dart

@@ -2,8 +2,8 @@
 
 import 'dart:convert';
 
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/auth/auth.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/notifiers/mock.dart';
 import 'package:electricsql/src/satellite/mock.dart';

packages/electricsql/test/satellite/process_timing.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: unreachable_from_main
 
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/notifiers/mock.dart';
 import 'package:electricsql/src/satellite/config.dart';

packages/electricsql/test/satellite/registry_test.dart

@@ -1,6 +1,6 @@
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/client/model/schema.dart';
 import 'package:electricsql/src/config/config.dart';
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/electric/mock.dart';
 import 'package:electricsql/src/migrators/migrators.dart';
 import 'package:electricsql/src/migrators/mock.dart';

packages/electricsql/test/satellite/serialization.dart

@@ -2,9 +2,9 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/client/conversions/types.dart';
 import 'package:electricsql/src/client/model/schema.dart' hide Relation;
-import 'package:electricsql/src/electric/adapter.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/proto/satellite.pb.dart';
 import 'package:electricsql/src/satellite/client.dart';

packages/electricsql/test/support/satellite_helpers.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:electricsql/src/electric/adapter.dart';
+import 'package:electricsql/drivers/drivers.dart';
 import 'package:electricsql/src/migrators/query_builder/query_builder.dart';
 import 'package:electricsql/src/satellite/oplog.dart';
 import 'package:electricsql/src/util/converters/helpers.dart';