From 07a31f896648e512b8f57a1348ca65b471d48448 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 10 Jul 2024 17:32:27 +0200 Subject: [PATCH 1/7] Import sqlite3_common for web --- packages/drift_sqlite_async/lib/src/executor.dart | 2 +- packages/drift_sqlite_async/pubspec.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/drift_sqlite_async/lib/src/executor.dart b/packages/drift_sqlite_async/lib/src/executor.dart index a106b91..91c6f7f 100644 --- a/packages/drift_sqlite_async/lib/src/executor.dart +++ b/packages/drift_sqlite_async/lib/src/executor.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:drift/backends.dart'; import 'package:drift_sqlite_async/src/transaction_executor.dart'; -import 'package:sqlite_async/sqlite3.dart'; +import 'package:sqlite_async/sqlite3_common.dart'; import 'package:sqlite_async/sqlite_async.dart'; class _SqliteAsyncDelegate extends DatabaseDelegate { diff --git a/packages/drift_sqlite_async/pubspec.yaml b/packages/drift_sqlite_async/pubspec.yaml index 42d998c..5b7f8ff 100644 --- a/packages/drift_sqlite_async/pubspec.yaml +++ b/packages/drift_sqlite_async/pubspec.yaml @@ -23,3 +23,11 @@ dev_dependencies: sqlite3: ^2.4.0 test: ^1.25.2 test_api: ^0.7.0 + +platforms: + android: + ios: + linux: + macos: + windows: + web: From f5609fa336ba0ac88df6e44232b750b7308951c4 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 10 Jul 2024 17:38:07 +0200 Subject: [PATCH 2/7] Bump version --- packages/drift_sqlite_async/CHANGELOG.md | 4 ++++ packages/drift_sqlite_async/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/drift_sqlite_async/CHANGELOG.md b/packages/drift_sqlite_async/CHANGELOG.md index ce4d763..1ff8353 100644 --- a/packages/drift_sqlite_async/CHANGELOG.md +++ b/packages/drift_sqlite_async/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.0-alpha.3 + +- Import `sqlite3_common` instead of `sqlite3` for web support. + ## 0.1.0-alpha.2 - Update dependency `sqlite_async` to version 0.8.0. diff --git a/packages/drift_sqlite_async/pubspec.yaml b/packages/drift_sqlite_async/pubspec.yaml index 5b7f8ff..5919f56 100644 --- a/packages/drift_sqlite_async/pubspec.yaml +++ b/packages/drift_sqlite_async/pubspec.yaml @@ -1,5 +1,5 @@ name: drift_sqlite_async -version: 0.1.0-alpha.2 +version: 0.1.0-alpha.3 homepage: https://github.com/powersync-ja/sqlite_async.dart repository: https://github.com/powersync-ja/sqlite_async.dart description: Use Drift with a sqlite_async database, allowing both to be used in the same application. From 687c6334cadfc3190212a328dac28afb456d3863 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 10 Jul 2024 18:02:52 +0200 Subject: [PATCH 3/7] Add web instructions for drift --- packages/drift_sqlite_async/README.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/drift_sqlite_async/README.md b/packages/drift_sqlite_async/README.md index c732652..977dbe1 100644 --- a/packages/drift_sqlite_async/README.md +++ b/packages/drift_sqlite_async/README.md @@ -3,12 +3,12 @@ `drift_sqlite_async` allows using drift on an sqlite_async database - the APIs from both can be seamlessly used together in the same application. Supported functionality: + 1. All queries including select, insert, update, delete. 2. Transactions and nested transactions. 3. Table updates are propagated between sqlite_async and Drift - watching queries works using either API. 4. Select queries can run concurrently with writes and other select statements. - ## Usage Use `SqliteAsyncDriftConnection` to create a DatabaseConnection / QueryExecutor for Drift from the sqlite_async SqliteDatabase: @@ -59,4 +59,24 @@ These events are only sent while no write transaction is active. Within Drift's transactions, Drift's own update notifications will still apply for watching queries within that transaction. -Note: There is a possibility of events being duplicated. This should not have a significant impact on most applications. \ No newline at end of file +Note: There is a possibility of events being duplicated. This should not have a significant impact on most applications. + +## Web + +Note: Web support is currently in Beta. + +Web support requires Sqlite3 WASM and web worker Javascript files to be accessible. These file need to be put into the `web/` directory of your app. + +The compiled web worker files can be found in our Github [releases](https://github.com/powersync-ja/sqlite_async.dart/releases) +The `sqlite3.wasm` asset can be found [here](https://github.com/simolus3/sqlite3.dart/releases) + +In the end your `web/` directory will look like the following + +``` +web/ +├── favicon.png +├── index.html +├── manifest.json +├── db_worker.js +└── sqlite3.wasm +``` From bfeb0f9f31d8870053cc053d0776fe7e3f481ae8 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 11 Jul 2024 16:51:08 +0200 Subject: [PATCH 4/7] Bump version --- CHANGELOG.md | 13 +++++++------ packages/drift_sqlite_async/pubspec.yaml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed3924..024eee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,22 +11,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline Packages with breaking changes: - - There are no breaking changes in this release. +- There are no breaking changes in this release. Packages with other changes: - - [`sqlite_async` - `v0.8.1`](#sqlite_async---v081) - - [`drift_sqlite_async` - `v0.1.0-alpha.3`](#drift_sqlite_async---v010-alpha3) +- [`sqlite_async` - `v0.8.1`](#sqlite_async---v081) +- [`drift_sqlite_async` - `v0.1.0-alpha.4`](#drift_sqlite_async---v010-alpha4) Packages with dependency updates only: > Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project. - - `drift_sqlite_async` - `v0.1.0-alpha.3` +#### `drift_sqlite_async` - `v0.1.0-alpha.4` + +- **FEAT**: web support. --- #### `sqlite_async` - `v0.8.1` - - **FEAT**: use navigator locks. - +- **FEAT**: use navigator locks. diff --git a/packages/drift_sqlite_async/pubspec.yaml b/packages/drift_sqlite_async/pubspec.yaml index 59d5bba..4a6bd21 100644 --- a/packages/drift_sqlite_async/pubspec.yaml +++ b/packages/drift_sqlite_async/pubspec.yaml @@ -1,5 +1,5 @@ name: drift_sqlite_async -version: 0.1.0-alpha.3 +version: 0.1.0-alpha.4 homepage: https://github.com/powersync-ja/sqlite_async.dart repository: https://github.com/powersync-ja/sqlite_async.dart description: Use Drift with a sqlite_async database, allowing both to be used in the same application. From 73028b252936c84756a1f737c872f7807dbb3411 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 11 Jul 2024 18:03:43 +0200 Subject: [PATCH 5/7] Pin drift version --- packages/drift_sqlite_async/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/drift_sqlite_async/pubspec.yaml b/packages/drift_sqlite_async/pubspec.yaml index 4a6bd21..225e231 100644 --- a/packages/drift_sqlite_async/pubspec.yaml +++ b/packages/drift_sqlite_async/pubspec.yaml @@ -14,11 +14,11 @@ topics: environment: sdk: ">=3.0.0 <4.0.0" dependencies: - drift: ^2.15.0 + drift: 2.18.0 sqlite_async: ^0.8.1 dev_dependencies: build_runner: ^2.4.8 - drift_dev: ^2.15.0 + drift_dev: 2.18.0 glob: ^2.1.2 sqlite3: ^2.4.0 test: ^1.25.2 From c057e3b15d3bb052874326cf2bd20a90be660dfa Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 11 Jul 2024 21:55:29 +0200 Subject: [PATCH 6/7] Lower drift version --- packages/drift_sqlite_async/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/drift_sqlite_async/pubspec.yaml b/packages/drift_sqlite_async/pubspec.yaml index 225e231..02bec38 100644 --- a/packages/drift_sqlite_async/pubspec.yaml +++ b/packages/drift_sqlite_async/pubspec.yaml @@ -14,11 +14,11 @@ topics: environment: sdk: ">=3.0.0 <4.0.0" dependencies: - drift: 2.18.0 + drift: <2.19.0 sqlite_async: ^0.8.1 dev_dependencies: build_runner: ^2.4.8 - drift_dev: 2.18.0 + drift_dev: <2.19.0 glob: ^2.1.2 sqlite3: ^2.4.0 test: ^1.25.2 From 45909e3efde858e5615d3745327b581864b10bb6 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 11 Jul 2024 21:57:43 +0200 Subject: [PATCH 7/7] Drift version bounds --- packages/drift_sqlite_async/pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/drift_sqlite_async/pubspec.yaml b/packages/drift_sqlite_async/pubspec.yaml index 02bec38..842af6e 100644 --- a/packages/drift_sqlite_async/pubspec.yaml +++ b/packages/drift_sqlite_async/pubspec.yaml @@ -14,11 +14,11 @@ topics: environment: sdk: ">=3.0.0 <4.0.0" dependencies: - drift: <2.19.0 + drift: ">=2.15.0 <2.19.0" sqlite_async: ^0.8.1 dev_dependencies: build_runner: ^2.4.8 - drift_dev: <2.19.0 + drift_dev: ">=2.15.0 <2.19.0" glob: ^2.1.2 sqlite3: ^2.4.0 test: ^1.25.2