allow overidig of db config

hpoul · hpoul · commit 458b03bdef8c · 2020-07-23T11:52:18.000+02:00
diff --git a/lib/src/config.dart b/lib/src/config.dart
@@ -22,8 +22,8 @@ class DatabaseConfig {
   factory DatabaseConfig.fromJson(Map<String, dynamic> json) =>
       _$DatabaseConfigFromJson(json);
 
-  factory DatabaseConfig.defaults() =>
-      DatabaseConfig.fromJson(_jsonFromEnvironment());
+  factory DatabaseConfig.fromEnvironment({DatabaseConfig defaults}) =>
+      DatabaseConfig.fromJson(_jsonFromEnvironment(defaults));
   Map<String, dynamic> toJson() => _$DatabaseConfigToJson(this);
 
   @JsonKey(defaultValue: 'localhost')
@@ -47,10 +47,14 @@ class DatabaseConfig {
       );
 }
 
-Map<String, dynamic> _jsonFromEnvironment() {
+Map<String, dynamic> _jsonFromEnvironment(DatabaseConfig defaults) {
+  final defaultJson = defaults?.toJson() ?? <String, dynamic>{};
   final dbConfig = Platform.environment['DBCONFIG'];
   if (dbConfig != null) {
-    return json.decode(dbConfig) as Map<String, dynamic>;
+    return <String, dynamic>{
+      ...defaultJson,
+      ...(json.decode(dbConfig) as Map<String, dynamic>),
+    };
   }
-  return <String, dynamic>{};
+  return defaultJson;
 }
diff --git a/lib/src/database_access.dart b/lib/src/database_access.dart
@@ -307,7 +307,7 @@ class Migrations<TX extends DatabaseTransactionBase<TABLES>,
 
   final int id;
   final String versionCode;
-  final Future<void> Function(TX conn) up;
+  final Future<void> Function(TX tx) up;
 }
 
 class SimpleWhere {

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ class Migrations<TX extends DatabaseTransactionBase<TABLES>,`
`307`	`307`
`308`	`308`	`final int id;`
`309`	`309`	`final String versionCode;`
`310`		`- final Future<void> Function(TX conn) up;`
	`310`	`+ final Future<void> Function(TX tx) up;`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`class SimpleWhere {`