Skip to content

Commit 38a9a7d

Browse files
simolus3simolus3
authored
Merge pull request #18 from powersync-ja/feat/update-upstream-sqlite
Update upstream sqlite package to 2.6.0.
2 parents 8ef40f3 + 4d77722 commit 38a9a7d

File tree

138 files changed

+4122
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+4122
-190
lines changed

‎.github/workflows/main.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
name: Compile sqlite3 for ${{ matrix.os }}
1616
runs-on: ${{ matrix.os }}
1717
env:
18-
SQLITE_YEAR: "2023"
19-
SQLITE_VERSION: "3420000"
18+
SQLITE_YEAR: "2024"
19+
SQLITE_VERSION: "3470200"
2020

2121
steps:
2222
- uses: actions/cache@v4
@@ -84,7 +84,7 @@ jobs:
8484
needs: [compile_sqlite3]
8585
strategy:
8686
matrix:
87-
package: [sqlite3]
87+
package: [sqlite3, sqlite3_test]
8888
dart: [stable]
8989

9090
name: Analyze on Dart ${{ matrix.dart }}
@@ -182,12 +182,13 @@ jobs:
182182
- name: Test sqlite3_test package
183183
run: |
184184
dart pub get
185-
dart test -P ci
186-
working-directory: sqlite3/
185+
dart test
186+
working-directory: sqlite3_test/
187187

188188
- name: Web tests
189189
run: |
190-
curl https://storage.googleapis.com/simon-public-euw3/assets/sqlite3/wasm/2.4.6/sqlite3.wasm -o example/web/sqlite3.wasm
190+
curl https://simon-public.fsn1.your-objectstorage.com/assets/sqlite3/2.6.0/sqlite3.wasm -o example/web/sqlite3.wasm
191+
curl https://simon-public.fsn1.your-objectstorage.com/assets/sqlite3/2.6.0/sqlite3mc.wasm -o example/web/sqlite3mc.wasm
191192
dart test -P web -r expanded
192193
# If browsers behave differently on different platforms, surely that's not our fault...
193194
# So, only run browser tests on Linux to be faster.

‎integration_tests/flutter_libs/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

‎integration_tests/flutter_libs/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// swift-tools-version: 5.9
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
//
4+
// Generated file. Do not edit.
5+
//
6+
7+
import PackageDescription
8+
9+
let package = Package(
10+
name: "FlutterGeneratedPluginSwiftPackage",
11+
platforms: [
12+
.iOS("12.0")
13+
],
14+
products: [
15+
.library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
16+
],
17+
dependencies: [
18+
.package(name: "integration_test", path: "/Users/simon/fvm/versions/master/packages/integration_test/ios/integration_test"),
19+
.package(name: "sqlite3_flutter_libs", path: "/Users/simon/src/sqlite3.dart/sqlite3_flutter_libs/darwin/sqlite3_flutter_libs")
20+
],
21+
targets: [
22+
.target(
23+
name: "FlutterGeneratedPluginSwiftPackage",
24+
dependencies: [
25+
.product(name: "integration-test", package: "integration_test"),
26+
.product(name: "sqlite3-flutter-libs", package: "sqlite3_flutter_libs")
27+
]
28+
)
29+
]
30+
)

‎integration_tests/flutter_libs/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//
2+
// Generated file. Do not edit.
3+
//

‎integration_tests/flutter_libs/macos/Podfile.lock

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
PODS:
22
- FlutterMacOS (1.0.0)
3-
- sqlite3 (3.44.0):
4-
- sqlite3/common (= 3.44.0)
5-
- sqlite3/common (3.44.0)
6-
- sqlite3/fts5 (3.44.0):
3+
- sqlite3 (3.47.0):
4+
- sqlite3/common (= 3.47.0)
5+
- sqlite3/common (3.47.0)
6+
- sqlite3/dbstatvtab (3.47.0):
77
- sqlite3/common
8-
- sqlite3/perf-threadsafe (3.44.0):
8+
- sqlite3/fts5 (3.47.0):
99
- sqlite3/common
10-
- sqlite3/rtree (3.44.0):
10+
- sqlite3/perf-threadsafe (3.47.0):
1111
- sqlite3/common
12-
- sqlite3/spellfix1 (3.44.0):
12+
- sqlite3/rtree (3.47.0):
13+
- sqlite3/common
14+
- sqlite3/spellfix1 (3.47.0):
1315
- sqlite3/common
1416
- sqlite3_flutter_libs (0.0.1):
17+
- Flutter
1518
- FlutterMacOS
16-
- sqlite3 (~> 3.44.0)
19+
- sqlite3 (~> 3.47.0)
20+
- sqlite3/dbstatvtab
1721
- sqlite3/fts5
1822
- sqlite3/perf-threadsafe
1923
- sqlite3/rtree
2024

2125
DEPENDENCIES:
2226
- FlutterMacOS (from `Flutter/ephemeral`)
2327
- sqlite3/spellfix1
24-
- sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`)
28+
- sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin`)
2529

2630
SPEC REPOS:
2731
trunk:
@@ -31,13 +35,13 @@ EXTERNAL SOURCES:
3135
FlutterMacOS:
3236
:path: Flutter/ephemeral
3337
sqlite3_flutter_libs:
34-
:path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos
38+
:path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/darwin
3539

3640
SPEC CHECKSUMS:
3741
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
38-
sqlite3: 6e2d4a4879854d0ec86b476bf3c3e30870bac273
39-
sqlite3_flutter_libs: a25f3a0f522fdcd8fef6a4a50a3d681dd43d8dea
42+
sqlite3: 0aa20658a9b238a3b1ff7175eb7bdd863b0ab4fd
43+
sqlite3_flutter_libs: 4ed45d66960c84b1616c887c9818c832d4289092
4044

4145
PODFILE CHECKSUM: 61e9fedf3423d4f00828847139028f442a455364
4246

43-
COCOAPODS: 1.14.2
47+
COCOAPODS: 1.14.3

‎integration_tests/flutter_libs/macos/Runner.xcodeproj/project.pbxproj

+21-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2828
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
2929
C13042E460707A005C110913 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91E41AE44FFF9BE5EAFC9EF5 /* Pods_Runner.framework */; };
30+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
3031
/* End PBXBuildFile section */
3132

3233
/* Begin PBXContainerItemProxy section */
@@ -80,6 +81,7 @@
8081
isa = PBXFrameworksBuildPhase;
8182
buildActionMask = 2147483647;
8283
files = (
84+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
8385
C13042E460707A005C110913 /* Pods_Runner.framework in Frameworks */,
8486
);
8587
runOnlyForDeploymentPostprocessing = 0;
@@ -175,6 +177,9 @@
175177

176178
/* Begin PBXNativeTarget section */
177179
33CC10EC2044A3C60003C045 /* Runner */ = {
180+
packageProductDependencies = (
181+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
182+
);
178183
isa = PBXNativeTarget;
179184
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
180185
buildPhases = (
@@ -200,10 +205,13 @@
200205

201206
/* Begin PBXProject section */
202207
33CC10E52044A3C60003C045 /* Project object */ = {
208+
packageReferences = (
209+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
210+
);
203211
isa = PBXProject;
204212
attributes = {
205213
LastSwiftUpdateCheck = 0920;
206-
LastUpgradeCheck = 1430;
214+
LastUpgradeCheck = 1510;
207215
ORGANIZATIONNAME = "";
208216
TargetAttributes = {
209217
33CC10EC2044A3C60003C045 = {
@@ -628,6 +636,18 @@
628636
defaultConfigurationName = Release;
629637
};
630638
/* End XCConfigurationList section */
639+
/* Begin XCLocalSwiftPackageReference section */
640+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
641+
isa = XCLocalSwiftPackageReference;
642+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
643+
};
644+
/* End XCLocalSwiftPackageReference section */
645+
/* Begin XCSwiftPackageProductDependency section */
646+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
647+
isa = XCSwiftPackageProductDependency;
648+
productName = FlutterGeneratedPluginSwiftPackage;
649+
};
650+
/* End XCSwiftPackageProductDependency section */
631651
};
632652
rootObject = 33CC10E52044A3C60003C045 /* Project object */;
633653
}

‎integration_tests/flutter_libs/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"originHash" : "f753fb27fa26d31d71ae095b813ee3082cbd650203f170450c96e6158cc8e4cb",
3+
"pins" : [
4+
{
5+
"identity" : "csqlite",
6+
"kind" : "remoteSourceControl",
7+
"location" : "https://github.com/sbooth/CSQLite.git",
8+
"state" : {
9+
"revision" : "f9bc82fd757667a5d1819db4fbb073c97488eb85",
10+
"version" : "3.47.1"
11+
}
12+
}
13+
],
14+
"version" : 3
15+
}

‎integration_tests/flutter_libs/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
18+
BuildableName = "flutter_libs.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"
@@ -48,6 +66,7 @@
4866
ignoresPersistentStateOnLaunch = "NO"
4967
debugDocumentVersioning = "YES"
5068
debugServiceExtension = "internal"
69+
enableGPUValidationMode = "1"
5170
allowLocationSimulation = "YES">
5271
<BuildableProductRunnable
5372
runnableDebuggingMode = "0">

‎integration_tests/flutter_libs/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"originHash" : "f753fb27fa26d31d71ae095b813ee3082cbd650203f170450c96e6158cc8e4cb",
3+
"pins" : [
4+
{
5+
"identity" : "csqlite",
6+
"kind" : "remoteSourceControl",
7+
"location" : "https://github.com/sbooth/CSQLite.git",
8+
"state" : {
9+
"revision" : "f9bc82fd757667a5d1819db4fbb073c97488eb85",
10+
"version" : "3.47.1"
11+
}
12+
}
13+
],
14+
"version" : 3
15+
}

‎integration_tests/flutter_libs/macos/Runner/AppDelegate.swift

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

‎integration_tests/flutter_libs/pubspec.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ description: Integration tests for the sqlite3_flutter_libs package
44
publish_to: 'none'
55
version: 1.0.0+1
66

7+
flutter:
8+
disable-swift-package-manager: true
9+
710
environment:
811
sdk: ^3.5.0
12+
flutter: ^3.24.0
913

1014
dependencies:
1115
sqlite3_flutter_libs:

‎integration_tests/flutter_libs_swiftpm/.gitignore

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
6+
.DS_Store
7+
.atom/
8+
.build/
9+
.buildlog/
10+
.history
11+
.svn/
12+
.swiftpm/
13+
migrate_working_dir/
14+
15+
# IntelliJ related
16+
*.iml
17+
*.ipr
18+
*.iws
19+
.idea/
20+
21+
# The .vscode folder contains launch configuration and tasks you configure in
22+
# VS Code which you may wish to be included in version control, so this line
23+
# is commented out by default.
24+
#.vscode/
25+
26+
# Flutter/Dart/Pub related
27+
**/doc/api/
28+
**/ios/Flutter/.last_build_id
29+
.dart_tool/
30+
.flutter-plugins
31+
.flutter-plugins-dependencies
32+
.pub-cache/
33+
.pub/
34+
/build/
35+
36+
# Symbolication related
37+
app.*.symbols
38+
39+
# Obfuscation related
40+
app.*.map.json
41+
42+
# Android Studio will place build artifacts here
43+
/android/app/debug
44+
/android/app/profile
45+
/android/app/release

‎integration_tests/flutter_libs_swiftpm/.metadata

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This file tracks properties of this Flutter project.
2+
# Used by Flutter tool to assess capabilities and perform upgrades etc.
3+
#
4+
# This file should be version controlled and should not be manually edited.
5+
6+
version:
7+
revision: "03aeaf158a7bb4b6b51fe8730a673829d64a517c"
8+
channel: "master"
9+
10+
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
17+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
18+
- platform: android
19+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
20+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
21+
- platform: ios
22+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
23+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
24+
- platform: linux
25+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
26+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
27+
- platform: macos
28+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
29+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
30+
- platform: web
31+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
32+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
33+
- platform: windows
34+
create_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
35+
base_revision: 03aeaf158a7bb4b6b51fe8730a673829d64a517c
36+
37+
# User provided section
38+
39+
# List of Local paths (relative to this file) that should be
40+
# ignored by the migrate tool.
41+
#
42+
# Files that are not part of the templates will be ignored by default.
43+
unmanaged_files:
44+
- 'lib/main.dart'
45+
- 'ios/Runner.xcodeproj/project.pbxproj'

0 commit comments

Comments
 (0)