Update integration test architecture

drift/pubspec.yaml

@@ -22,6 +22,8 @@ dev_dependencies:
   build_runner_core: ^7.0.0
   build_verify: ^3.0.0
   drift_dev: any
+  drift_testcases:
+    path: ../extras/integration_tests/drift_testcases
   http: ^0.13.4
   uuid: ^3.0.0
   path: ^1.8.0

drift/test/integration_tests/common_ffi_test.dart

@@ -0,0 +1,81 @@
+@TestOn('vm')
+import 'dart:io';
+
+import 'package:drift/native.dart';
+import 'package:drift_testcases/tests.dart';
+import 'package:path/path.dart' show join;
+import 'package:sqlite3/sqlite3.dart' hide Database;
+import 'package:test/test.dart';
+
+class DriftNativeExcecutor extends TestExecutor {
+  static String fileName =
+      'drift-native-tests-${DateTime.now().toIso8601String()}';
+  final File file = File(join(Directory.systemTemp.path, fileName));
+
+  @override
+  bool get supportsNestedTransactions => true;
+
+  @override
+  bool get supportsReturning {
+    final version = sqlite3.version;
+    return version.versionNumber > 3035000;
+  }
+
+  @override
+  DatabaseConnection createConnection() {
+    return DatabaseConnection.fromExecutor(NativeDatabase(file));
+  }
+
+  @override
+  Future deleteData() async {
+    if (await file.exists()) {
+      await file.delete();
+    }
+  }
+}
+
+void main() {
+  runAllTests(DriftNativeExcecutor());
+
+  test('can save and restore a database', () async {
+    final mainFile =
+        File(join(Directory.systemTemp.path, 'drift-save-and-restore-tests-1'));
+    final createdForSwap =
+        File(join(Directory.systemTemp.path, 'drift-save-and-restore-tests-2'));
+
+    if (await mainFile.exists()) {
+      await mainFile.delete();
+    }
+    if (await createdForSwap.exists()) {
+      await createdForSwap.delete();
+    }
+
+    const nameInSwap = 'swap user';
+    const nameInMain = 'main';
+
+    // Prepare the file we're swapping in later
+    final dbForSetup = Database.executor(NativeDatabase(createdForSwap));
+    await dbForSetup.into(dbForSetup.users).insert(
+        UsersCompanion.insert(name: nameInSwap, birthDate: DateTime.now()));
+    await dbForSetup.close();
+
+    // Open the main file
+    var db = Database.executor(NativeDatabase(mainFile));
+    await db.into(db.users).insert(
+        UsersCompanion.insert(name: nameInMain, birthDate: DateTime.now()));
+    await db.close();
+
+    // Copy swap file to main file
+    await mainFile.writeAsBytes(await createdForSwap.readAsBytes(),
+        flush: true);
+
+    // Re-open database
+    db = Database.executor(NativeDatabase(mainFile));
+    final users = await db.select(db.users).get();
+
+    expect(
+      users.map((u) => u.name),
+      allOf(contains(nameInSwap), isNot(contains(nameInMain))),
+    );
+  });
+}

drift/test/integration_tests/common_wasm_test.dart

@@ -0,0 +1,46 @@
+@TestOn('browser')
+import 'package:drift/wasm.dart';
+import 'package:drift_testcases/tests.dart';
+import 'package:http/http.dart' as http;
+import 'package:sqlite3/wasm.dart';
+import 'package:test/test.dart';
+
+class DriftWasmExecutor extends TestExecutor {
+  final FileSystem fs;
+  final WasmSqlite3 Function() sqlite3;
+
+  DriftWasmExecutor(this.fs, this.sqlite3);
+
+  @override
+  bool get supportsNestedTransactions => true;
+
+  @override
+  bool get supportsReturning => true;
+
+  @override
+  DatabaseConnection createConnection() {
+    return DatabaseConnection.fromExecutor(
+        WasmDatabase(sqlite3: sqlite3(), path: 'drift_test.db'));
+  }
+
+  @override
+  Future<void> deleteData() async {
+    fs.clear();
+  }
+}
+
+void main() {
+  final fs = FileSystem.inMemory();
+  late WasmSqlite3 sqlite3;
+
+  setUpAll(() async {
+    final channel = spawnHybridUri('/test/test_utils/sqlite_server.dart');
+    final port = await channel.stream.first as int;
+
+    final response =
+        await http.get(Uri.parse('http://localhost:$port/sqlite3.wasm'));
+    sqlite3 = await WasmSqlite3.load(response.bodyBytes);
+  });
+
+  runAllTests(DriftWasmExecutor(fs, () => sqlite3));
+}

drift_sqflite/android/app/build.gradle

@@ -27,6 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -43,7 +44,9 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.sqflite"
+        applicationId "com.example.drift_sqflite"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

drift_sqflite/android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.sqflite">
-    <!-- Flutter needs it to communicate with the running application
+    package="com.example.drift_sqflite">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

drift_sqflite/android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.sqflite">
+    package="com.example.drift_sqflite">
    <application
-        android:label="sqflite"
+        android:label="drift_sqflite"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

drift_sqflite/android/app/src/main/kotlin/com/example/drift_sqflite/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.sqflite
+package com.example.drift_sqflite
 
 import io.flutter.embedding.android.FlutterActivity
 

drift_sqflite/android/app/src/main/res/values-night/styles.xml

@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

drift_sqflite/android/app/src/main/res/values/styles.xml

@@ -3,7 +3,7 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

drift_sqflite/android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.sqflite">
-    <!-- Flutter needs it to communicate with the running application
+    package="com.example.drift_sqflite">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

drift_sqflite/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

drift_sqflite/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

drift_sqflite/integration_test/drift_sqflite_test.dart

@@ -1,12 +1,12 @@
 import 'dart:io';
 
 import 'package:drift_sqflite/drift_sqflite.dart';
+import 'package:drift_testcases/tests.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart' show WidgetsFlutterBinding;
+import 'package:integration_test/integration_test.dart';
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart' show getDatabasesPath;
 import 'package:test/test.dart';
-import 'package:tests/tests.dart';
 
 class SqfliteExecutor extends TestExecutor {
   @override
@@ -34,7 +34,7 @@ class SqfliteExecutor extends TestExecutor {
 }
 
 Future<void> main() async {
-  WidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   runAllTests(SqfliteExecutor());
 

drift_sqflite/ios/.gitignore

@@ -1,3 +1,4 @@
+**/dgph
 *.mode1v3
 *.mode2v3
 *.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
 Flutter/Generated.xcconfig
+Flutter/ephemeral/
 Flutter/app.flx
 Flutter/app.zip
 Flutter/flutter_assets/

drift_sqflite/ios/Flutter/AppFrameworkInfo.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <string>en</string>
   <key>CFBundleExecutable</key>
   <string>App</string>
   <key>CFBundleIdentifier</key>
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

drift_sqflite/ios/Flutter/Debug.xcconfig

@@ -0,0 +1 @@
+#include "Generated.xcconfig"

drift_sqflite/ios/Flutter/Release.xcconfig

@@ -0,0 +1 @@
+#include "Generated.xcconfig"

drift_sqflite/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -272,7 +272,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -289,17 +289,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.moorFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.driftSqflite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -354,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -403,11 +398,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -421,17 +417,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.moorFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.driftSqflite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -448,17 +439,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.moorFlutter;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.driftSqflite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

drift_sqflite/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

drift_sqflite/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

drift_sqflite/ios/Runner/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Drift Sqflite</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -11,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>moor_flutter</string>
+	<string>drift_sqflite</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -41,5 +43,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

drift_sqflite/pubspec.yaml

@@ -16,10 +16,18 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  integration_test:
+    sdk: flutter
   flutter_lints: ^1.0.4
   flutter_test:
     sdk: flutter
+  drift_testcases:
+    path: ../extras/integration_tests/drift_testcases
 
 dependency_overrides:
   drift:
-    path: ../drift/
+    path: ../drift/
+
+flutter:
+  assets:
+    - test_asset.db

extras/drift_postgres/pubspec.yaml

@@ -10,7 +10,9 @@ dependencies:
   postgres: ^2.4.3
 
 dev_dependencies:
-  build_runner: ^2.0.0
+  test: ^1.18.0
+  drift_testcases:
+    path: ../integration_tests/drift_testcases
 
 dependency_overrides:
   drift:

extras/drift_postgres/test/drift_postgres_test.dart

@@ -1,6 +1,6 @@
 import 'package:drift_postgres/postgres.dart';
+import 'package:drift_testcases/tests.dart';
 import 'package:postgres/postgres.dart';
-import 'package:tests/tests.dart';
 
 class PgExecutor extends TestExecutor {
   @override
@@ -23,7 +23,7 @@ class PgExecutor extends TestExecutor {
   }
 
   @override
-  Future deleteData() async {}
+  Future<void> deleteData() async {}
 }
 
 void main() {

extras/integration_tests/drift_testcases/.gitignore

@@ -0,0 +1,10 @@
+# Files and directories created by pub.
+.dart_tool/
+.packages
+
+# Conventional directory for build outputs.
+build/
+
+# Omit committing pubspec.lock for library packages; see
+# https://dart.dev/guides/libraries/private-files#pubspeclock.
+pubspec.lock

extras/integration_tests/drift_testcases/README.md

@@ -0,0 +1,4 @@
+Defines testcases for integration tests.
+
+The core `drift` package, as well as `drift_sqflite` and the postgres
+implemtation depend on this package to run these tests.

extras/integration_tests/drift_testcases/analysis_options.yaml

@@ -0,0 +1 @@
+include: package:lints/recommended.yaml

extras/integration_tests/drift_testcases/lib/data/sample_data.dart

@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
-import 'package:tests/database/database.dart';
+
+import '../database/database.dart';
 
 const int dashId = 1, dukeId = 2, gopherId = 3;
 

extras/integration_tests/drift_testcases/lib/database/database.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
+import 'package:drift/drift.dart';
 import 'package:json_annotation/json_annotation.dart' as j;
 
-import 'package:tests/data/sample_data.dart' as people;
-import 'package:tests/tests.dart';
+import '../data/sample_data.dart' as people;
 
 part 'database.g.dart';
 

extras/integration_tests/drift_testcases/lib/suite/crud_tests.dart

@@ -21,9 +21,8 @@ void crudTests(TestExecutor executor) {
   test('update row', () async {
     final db = Database(executor.createConnection());
 
-    await db.update(db.users)
-      ..where((tbl) => tbl.id.equals(1))
-      ..write(UsersCompanion(name: Value("Jack")));
+    await (db.update(db.users)..where((tbl) => tbl.id.equals(1)))
+        .write(UsersCompanion(name: Value("Jack")));
     final updatedUser = await db.getUserById(1);
 
     expect(updatedUser.name, equals('Jack'));

extras/integration_tests/drift_testcases/lib/suite/custom_objects.dart

@@ -1,6 +1,6 @@
 import 'package:test/test.dart';
-import 'package:tests/database/database.dart';
 
+import '../database/database.dart';
 import 'suite.dart';
 
 void customObjectTests(TestExecutor executor) {

extras/integration_tests/drift_testcases/lib/suite/migrations.dart

@@ -1,6 +1,6 @@
 import 'package:test/test.dart';
-import 'package:tests/data/sample_data.dart' as people;
-import 'package:tests/tests.dart';
+import '../data/sample_data.dart' as people;
+import '../tests.dart';
 
 void migrationTests(TestExecutor executor) {
   test('creates users table when opening version 1', () async {

extras/integration_tests/drift_testcases/lib/suite/suite.dart

@@ -1,10 +1,10 @@
 import 'package:test/test.dart';
-import 'package:tests/suite/crud_tests.dart';
-import 'package:tests/suite/transactions.dart';
 
 import '../tests.dart';
+import 'crud_tests.dart';
 import 'custom_objects.dart';
 import 'migrations.dart';
+import 'transactions.dart';
 
 abstract class TestExecutor {
   DatabaseConnection createConnection();

extras/integration_tests/drift_testcases/lib/suite/transactions.dart

@@ -1,7 +1,8 @@
 import 'package:drift/drift.dart';
 import 'package:test/test.dart';
-import 'package:tests/data/sample_data.dart' as people;
-import 'package:tests/database/database.dart';
+
+import '../data/sample_data.dart' as people;
+import '../database/database.dart';
 
 import 'suite.dart';
 

extras/integration_tests/drift_testcases/pubspec.yaml

@@ -0,0 +1,26 @@
+name: drift_testcases
+description: A starting point for Dart libraries or applications.
+version: 1.0.0
+# homepage: https://www.example.com
+
+environment:
+  sdk: '>=2.17.0 <3.0.0'
+
+dependencies:
+  drift: ^2.0.0-0
+  json_annotation: ^4.5.0
+  test: ^1.16.0
+
+dev_dependencies:
+  build_runner: ^2.1.11
+  drift_dev: ^2.0.0
+  json_serializable: ^6.2.0
+  lints: ^2.0.0
+
+dependency_overrides:
+  drift:
+    path: ../../../drift
+  drift_dev:
+    path: ../../../drift_dev
+  sqlparser:
+    path: ../../../sqlparser

extras/integration_tests/ffi_on_flutter/.metadata

@@ -1,10 +1,45 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: d51fd86cdb486192e187ccdf6f02cb2a38273d8d
-  channel: beta
+  revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+  channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+    - platform: android
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+    - platform: ios
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+    - platform: linux
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+    - platform: macos
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+    - platform: web
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+    - platform: windows
+      create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+      base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

extras/integration_tests/ffi_on_flutter/README.md

@@ -0,0 +1,16 @@
+# ffi_on_flutter
+
+A new Flutter project.
+
+## Getting Started
+
+This project is a starting point for a Flutter application.
+
+A few resources to get you started if this is your first Flutter project:
+
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.

extras/integration_tests/ffi_on_flutter/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

extras/integration_tests/ffi_on_flutter/android/.gitignore

@@ -0,0 +1,13 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks

extras/integration_tests/ffi_on_flutter/android/app/build.gradle

@@ -22,23 +22,35 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
-    lintOptions {
-        disable 'InvalidPackage'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.flutter_db"
-        minSdkVersion 16
-        targetSdkVersion 28
+        applicationId "com.example.ffi_on_flutter"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -55,7 +67,5 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

extras/integration_tests/ffi_on_flutter/android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_db">
-    <!-- Flutter needs it to communicate with the running application
+    package="com.example.ffi_on_flutter">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

extras/integration_tests/ffi_on_flutter/android/app/src/main/AndroidManifest.xml

@@ -1,25 +1,34 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_db">
-
-    <application
-        android:label="flutter_db"
+    package="com.example.ffi_on_flutter">
+   <application
+        android:label="ffi_on_flutter"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
-
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-
         <activity
-            android:name="io.flutter.embedding.android.FlutterActivity"
+            android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

extras/integration_tests/ffi_on_flutter/android/app/src/main/kotlin/com/example/ffi_on_flutter/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.example.ffi_on_flutter
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

extras/integration_tests/ffi_on_flutter/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

extras/integration_tests/ffi_on_flutter/android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

extras/integration_tests/ffi_on_flutter/android/app/src/main/res/values/styles.xml

@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
 </resources>

extras/integration_tests/ffi_on_flutter/android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_db">
-    <!-- Flutter needs it to communicate with the running application
+    package="com.example.ffi_on_flutter">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

extras/integration_tests/ffi_on_flutter/android/build.gradle

@@ -1,18 +1,20 @@
 buildscript {
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

extras/integration_tests/ffi_on_flutter/android/gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-
-android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true

extras/integration_tests/ffi_on_flutter/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

extras/integration_tests/ffi_on_flutter/android/settings.gradle

@@ -1,15 +1,11 @@
 include ':app'
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
-}
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

extras/integration_tests/ffi_on_flutter/integration_test/drift_native.dart

@@ -1,13 +1,13 @@
 import 'dart:io';
 
-import 'package:flutter/widgets.dart' show WidgetsFlutterBinding;
-import 'package:moor/ffi.dart';
-import 'package:moor/isolate.dart';
+import 'package:drift/isolate.dart';
+import 'package:drift/native.dart';
+import 'package:drift_testcases/tests.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart' show getDatabasesPath;
 import 'package:sqlite3/sqlite3.dart' as raw;
 import 'package:test/test.dart';
-import 'package:tests/tests.dart';
 
 class FfiExecutor extends TestExecutor {
   final String dbPath;
@@ -17,10 +17,13 @@ class FfiExecutor extends TestExecutor {
   @override
   bool get supportsNestedTransactions => true;
 
+  @override
+  bool get supportsReturning => true;
+
   @override
   DatabaseConnection createConnection() {
     return DatabaseConnection.fromExecutor(
-        VmDatabase(File(join(dbPath, 'app_ffi.db'))));
+        NativeDatabase(File(join(dbPath, 'app_ffi.db'))));
   }
 
   @override
@@ -33,7 +36,7 @@ class FfiExecutor extends TestExecutor {
 }
 
 Future<void> main() async {
-  WidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   final dbPath = await getDatabasesPath();
   Directory(dbPath).createSync(recursive: true);
@@ -76,7 +79,7 @@ Future<void> main() async {
   test('isolates integration test', () async {
     // This test exists to verify that our communication protocol works when we
     // can only send primitive objects over isolates.
-    final isolate = await MoorIsolate.spawn(_openInBackground);
+    final isolate = await DriftIsolate.spawn(_openInBackground);
     final connection = await isolate.connect();
 
     final db = Database(connection);
@@ -95,5 +98,5 @@ Future<void> main() async {
 }
 
 DatabaseConnection _openInBackground() {
-  return DatabaseConnection.fromExecutor(VmDatabase.memory());
+  return DatabaseConnection.fromExecutor(NativeDatabase.memory());
 }

extras/integration_tests/ffi_on_flutter/ios/.gitignore

@@ -0,0 +1,34 @@
+**/dgph
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/ephemeral/
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3

extras/integration_tests/ffi_on_flutter/ios/Flutter/AppFrameworkInfo.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <string>en</string>
   <key>CFBundleExecutable</key>
   <string>App</string>
   <key>CFBundleIdentifier</key>
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

extras/integration_tests/ffi_on_flutter/ios/Flutter/Debug.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

extras/integration_tests/ffi_on_flutter/ios/Flutter/Release.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

extras/integration_tests/ffi_on_flutter/ios/Podfile

@@ -1,38 +0,0 @@
-# Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_ios_podfile_setup
-
-target 'Runner' do
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-  end
-end