From 7e83d7b969f2bcc4171765e612f0bdaf64460e4e Mon Sep 17 00:00:00 2001 From: unknown <55nknown@pm.me> Date: Sun, 3 Oct 2021 12:17:32 +0200 Subject: [PATCH] sqflite fix --- filcnaplo/lib/api/providers/database_provider.dart | 13 +++++++++++-- filcnaplo/lib/database/init.dart | 14 ++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/filcnaplo/lib/api/providers/database_provider.dart b/filcnaplo/lib/api/providers/database_provider.dart index 985d57d..7ed8267 100644 --- a/filcnaplo/lib/api/providers/database_provider.dart +++ b/filcnaplo/lib/api/providers/database_provider.dart @@ -1,5 +1,8 @@ +import 'dart:io'; + import 'package:filcnaplo/database/query.dart'; import 'package:filcnaplo/database/store.dart'; +import 'package:sqflite/sqflite.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; class DatabaseProvider { @@ -10,8 +13,14 @@ class DatabaseProvider { late UserDatabaseStore userStore; Future init() async { - var db = await databaseFactoryFfi.openDatabase("app.db"); - // _database = db; + Database db; + + if (Platform.isLinux || Platform.isWindows) { + db = await databaseFactoryFfi.openDatabase("app.db"); + } else { + db = await openDatabase("app.db"); + } + query = DatabaseQuery(db: db); store = DatabaseStore(db: db); userQuery = UserDatabaseQuery(db: db); diff --git a/filcnaplo/lib/database/init.dart b/filcnaplo/lib/database/init.dart index 666b18d..e4e81d5 100644 --- a/filcnaplo/lib/database/init.dart +++ b/filcnaplo/lib/database/init.dart @@ -1,13 +1,19 @@ +import 'dart:io'; + import 'package:filcnaplo/database/struct.dart'; import 'package:filcnaplo/models/settings.dart'; -import 'package:sqflite_common/sqlite_api.dart'; +import 'package:sqflite/sqflite.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; Future initDB() async { - sqfliteFfiInit(); + Database db; - // await deleteDatabase('app.db'); // for debugging - var db = await databaseFactoryFfi.openDatabase('app.db'); + if (Platform.isLinux || Platform.isWindows) { + sqfliteFfiInit(); + db = await databaseFactoryFfi.openDatabase("app.db"); + } else { + db = await openDatabase("app.db"); + } var settingsDB = await createSettingsTable(db);