Skip to content

Commit 43d2288

Browse files
artobartob
committed
Fixed style nits with flutter format.
1 parent d99b42d commit 43d2288

File tree

5 files changed

+103
-42
lines changed

5 files changed

+103
-42
lines changed

‎lib/sqlcipher.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import 'package:flutter/services.dart' show MethodChannel;
1313

1414
/// SQLCipher interface.
1515
abstract class SQLCipher {
16-
static const MethodChannel _channel = MethodChannel('flutter_sqlcipher/SQLCipher');
16+
static const MethodChannel _channel =
17+
MethodChannel('flutter_sqlcipher/SQLCipher');
1718

1819
/// Executes `PRAGMA cipher_version`.
1920
static Future<String> get version async {

‎lib/sqlite.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ export 'src/statement.dart' show SQLiteStatement;
1919

2020
/// SQLite interface.
2121
abstract class SQLite {
22-
static const MethodChannel _channel = MethodChannel('flutter_sqlcipher/SQLite');
22+
static const MethodChannel _channel =
23+
MethodChannel('flutter_sqlcipher/SQLite');
2324

2425
/// Executes `SELECT sqlite_version()`.
2526
static Future<String> get version async {

‎lib/src/cursor.dart‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* This is free and unencumbered software released into the public domain. */
22

3-
import 'package:flutter_android/android_database.dart' show Cursor, MatrixCursor;
3+
import 'package:flutter_android/android_database.dart'
4+
show Cursor, MatrixCursor;
45
import 'package:meta/meta.dart' show experimental, required;
56

67
import 'closable.dart' show SQLiteClosable;
@@ -15,13 +16,13 @@ import 'exceptions.dart';
1516
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteCursor
1617
class SQLiteCursor extends MatrixCursor implements SQLiteClosable {
1718
/// Constructs an empty cursor.
18-
SQLiteCursor.empty()
19-
: super.empty();
19+
SQLiteCursor.empty() : super.empty();
2020

2121
/// Constructs a cursor from the provided column/row data.
2222
@experimental
23-
SQLiteCursor.from({@required List<String> columns, @required List<List<dynamic>> rows})
24-
: super.from(columns: columns, rows: rows);
23+
SQLiteCursor.from(
24+
{@required List<String> columns, @required List<List<dynamic>> rows})
25+
: super.from(columns: columns, rows: rows);
2526

2627
/// Returns the value of the requested column as a boolean.
2728
///
@@ -44,12 +45,16 @@ class SQLiteCursor extends MatrixCursor implements SQLiteClosable {
4445
switch (getType(columnIndex)) {
4546
case Cursor.FIELD_TYPE_NULL:
4647
return null;
47-
case Cursor.FIELD_TYPE_STRING: // ISO-8601 strings ("YYYY-MM-DD HH:MM:SS.SSS")
48-
return DateTime.parse(getString(columnIndex)); // TODO: default timezone?
49-
case Cursor.FIELD_TYPE_INTEGER: // Unix time, seconds since 1970-01-01T00:00:00Z
50-
return DateTime.fromMillisecondsSinceEpoch(getInt(columnIndex) * 1000, isUtc: true);
51-
case Cursor.FIELD_TYPE_FLOAT: // Julian day numbers
52-
// TODO: implement support for Julian day numbers; for now, fall through:
48+
case Cursor
49+
.FIELD_TYPE_STRING: // ISO-8601 strings ("YYYY-MM-DD HH:MM:SS.SSS")
50+
return DateTime.parse(
51+
getString(columnIndex)); // TODO: default timezone?
52+
case Cursor
53+
.FIELD_TYPE_INTEGER: // Unix time, seconds since 1970-01-01T00:00:00Z
54+
return DateTime.fromMillisecondsSinceEpoch(getInt(columnIndex) * 1000,
55+
isUtc: true);
56+
case Cursor.FIELD_TYPE_FLOAT: // Julian day numbers
57+
// TODO: implement support for Julian day numbers; for now, fall through:
5358
default:
5459
throw SQLiteDatatypeMismatchException();
5560
}

‎lib/src/database.dart‎

Lines changed: 83 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import 'cursor.dart' show SQLiteCursor;
2222
///
2323
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase
2424
abstract class SQLiteDatabase implements SQLiteClosable {
25-
static const MethodChannel _channel = MethodChannel('flutter_sqlcipher/SQLiteDatabase');
25+
static const MethodChannel _channel =
26+
MethodChannel('flutter_sqlcipher/SQLiteDatabase');
2627

2728
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#CONFLICT_ABORT
2829
static const int CONFLICT_ABORT = 2;
@@ -97,21 +98,26 @@ abstract class SQLiteDatabase implements SQLiteClosable {
9798
/// Open the database according to the specified parameters.
9899
///
99100
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#openDatabase(java.lang.String,%20android.database.sqlite.SQLiteDatabase.CursorFactory,%20int)
100-
static Future<SQLiteDatabase> openDatabase(final String path, {String password, int flags = OPEN_READWRITE}) async {
101+
static Future<SQLiteDatabase> openDatabase(final String path,
102+
{String password, int flags = OPEN_READWRITE}) async {
101103
try {
102-
final Map<String, dynamic> request = <String, dynamic>{'path': path, 'password': password, 'flags': flags};
104+
final Map<String, dynamic> request = <String, dynamic>{
105+
'path': path,
106+
'password': password,
107+
'flags': flags
108+
};
103109
final int id = await _channel.invokeMethod('openDatabase', request);
104110
return _SQLiteDatabase(id);
105-
}
106-
on PlatformException catch (error) {
111+
} on PlatformException catch (error) {
107112
throw error; // TODO: improve error handling
108113
}
109114
}
110115

111116
/// Equivalent to `openDatabase(path, flags: CREATE_IF_NECESSARY)`.
112117
///
113118
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#openOrCreateDatabase(java.io.File,%20android.database.sqlite.SQLiteDatabase.CursorFactory)
114-
static Future<SQLiteDatabase> openOrCreateDatabase(final String path, {String password}) {
119+
static Future<SQLiteDatabase> openOrCreateDatabase(final String path,
120+
{String password}) {
115121
return openDatabase(path, password: password, flags: CREATE_IF_NECESSARY);
116122
}
117123

@@ -152,15 +158,21 @@ abstract class SQLiteDatabase implements SQLiteClosable {
152158
///
153159
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#beginTransaction()
154160
Future<void> beginTransaction() {
155-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'mode': 'exclusive'};
161+
final Map<String, dynamic> request = <String, dynamic>{
162+
'id': id,
163+
'mode': 'exclusive'
164+
};
156165
return _channel.invokeMethod('beginTransaction', request);
157166
}
158167

159168
/// Begins a transaction in `IMMEDIATE` mode.
160169
///
161170
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#beginTransactionNonExclusive()
162171
Future<void> beginTransactionNonExclusive() {
163-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'mode': 'immediate'};
172+
final Map<String, dynamic> request = <String, dynamic>{
173+
'id': id,
174+
'mode': 'immediate'
175+
};
164176
return _channel.invokeMethod('beginTransaction', request);
165177
}
166178

@@ -225,8 +237,13 @@ abstract class SQLiteDatabase implements SQLiteClosable {
225237
/// It has no means to return any data (such as the number of affected rows).
226238
///
227239
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#execSQL(java.lang.String)
228-
Future<void> execSQL(final String sql, [final List<dynamic> args = const []]) {
229-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'sql': sql, 'args': args};
240+
Future<void> execSQL(final String sql,
241+
[final List<dynamic> args = const []]) {
242+
final Map<String, dynamic> request = <String, dynamic>{
243+
'id': id,
244+
'sql': sql,
245+
'args': args
246+
};
230247
return _channel.invokeMethod('execSQL', request);
231248
}
232249

@@ -381,7 +398,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
381398
///
382399
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#needUpgrade(int)
383400
Future<bool> needUpgrade(final int newVersion) async {
384-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'newVersion': newVersion};
401+
final Map<String, dynamic> request = <String, dynamic>{
402+
'id': id,
403+
'newVersion': newVersion
404+
};
385405
return await _channel.invokeMethod('needUpgrade', request);
386406
}
387407

@@ -404,7 +424,7 @@ abstract class SQLiteDatabase implements SQLiteClosable {
404424
'distinct': distinct,
405425
'table': table,
406426
'columns': columns,
407-
'selection': where, // note the name mapping
427+
'selection': where, // note the name mapping
408428
'selectionArgs': whereArgs, // note the name mapping
409429
'groupBy': groupBy,
410430
'having': having,
@@ -413,8 +433,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
413433
};
414434
final List<dynamic> result = await _channel.invokeMethod('query', request);
415435
assert(result.length == 2);
416-
final List<String> cursorColumns = (result[0] as List<dynamic>).cast<String>();
417-
final List<List<dynamic>> cursorRows = (result[1] as List<dynamic>).cast<List<dynamic>>();
436+
final List<String> cursorColumns =
437+
(result[0] as List<dynamic>).cast<String>();
438+
final List<List<dynamic>> cursorRows =
439+
(result[1] as List<dynamic>).cast<List<dynamic>>();
418440
return SQLiteCursor.from(columns: cursorColumns, rows: cursorRows);
419441
}
420442

@@ -423,12 +445,20 @@ abstract class SQLiteDatabase implements SQLiteClosable {
423445
/// Runs the provided SQL and returns a cursor over the result set.
424446
///
425447
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#rawQuery(java.lang.String,%20java.lang.String[])
426-
Future<SQLiteCursor> rawQuery(final String sql, [final List<String> args = const <String>[]]) async {
427-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'sql': sql, 'args': args};
428-
final List<dynamic> result = await _channel.invokeMethod('rawQuery', request);
448+
Future<SQLiteCursor> rawQuery(final String sql,
449+
[final List<String> args = const <String>[]]) async {
450+
final Map<String, dynamic> request = <String, dynamic>{
451+
'id': id,
452+
'sql': sql,
453+
'args': args
454+
};
455+
final List<dynamic> result =
456+
await _channel.invokeMethod('rawQuery', request);
429457
assert(result.length == 2);
430-
final List<String> cursorColumns = (result[0] as List<dynamic>).cast<String>();
431-
final List<List<dynamic>> cursorRows = (result[1] as List<dynamic>).cast<List<dynamic>>();
458+
final List<String> cursorColumns =
459+
(result[0] as List<dynamic>).cast<String>();
460+
final List<List<dynamic>> cursorRows =
461+
(result[1] as List<dynamic>).cast<List<dynamic>>();
432462
return SQLiteCursor.from(columns: cursorColumns, rows: cursorRows);
433463
}
434464

@@ -470,7 +500,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
470500
///
471501
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#setForeignKeyConstraintsEnabled(boolean)
472502
Future<void> setForeignKeyConstraintsEnabled(final bool enable) {
473-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'enable': enable};
503+
final Map<String, dynamic> request = <String, dynamic>{
504+
'id': id,
505+
'enable': enable
506+
};
474507
return _channel.invokeMethod('setForeignKeyConstraintsEnabled', request);
475508
}
476509

@@ -481,7 +514,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
481514
///
482515
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#setLocale(java.util.Locale)
483516
Future<void> setLocale(final Locale locale) {
484-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'locale': locale.toString()};
517+
final Map<String, dynamic> request = <String, dynamic>{
518+
'id': id,
519+
'locale': locale.toString()
520+
};
485521
return _channel.invokeMethod('setLocale', request);
486522
}
487523

@@ -495,7 +531,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
495531
///
496532
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#setMaxSqlCacheSize(int)
497533
Future<void> setMaxSqlCacheSize(final int cacheSize) {
498-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'cacheSize': cacheSize};
534+
final Map<String, dynamic> request = <String, dynamic>{
535+
'id': id,
536+
'cacheSize': cacheSize
537+
};
499538
return _channel.invokeMethod('setMaxSqlCacheSize', request);
500539
}
501540

@@ -505,7 +544,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
505544
///
506545
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#setMaximumSize(long)
507546
Future<void> setMaximumSize(final int numBytes) {
508-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'numBytes': numBytes};
547+
final Map<String, dynamic> request = <String, dynamic>{
548+
'id': id,
549+
'numBytes': numBytes
550+
};
509551
return _channel.invokeMethod('setMaximumSize', request);
510552
}
511553

@@ -517,7 +559,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
517559
///
518560
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#setPageSize(long)
519561
Future<void> setPageSize(final int numBytes) {
520-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'numBytes': numBytes};
562+
final Map<String, dynamic> request = <String, dynamic>{
563+
'id': id,
564+
'numBytes': numBytes
565+
};
521566
return _channel.invokeMethod('setPageSize', request);
522567
}
523568

@@ -538,7 +583,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
538583
///
539584
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#setVersion(int)
540585
Future<void> setVersion(final int version) {
541-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'version': version};
586+
final Map<String, dynamic> request = <String, dynamic>{
587+
'id': id,
588+
'version': version
589+
};
542590
return _channel.invokeMethod('setVersion', request);
543591
}
544592

@@ -588,7 +636,10 @@ abstract class SQLiteDatabase implements SQLiteClosable {
588636
///
589637
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#validateSql(java.lang.String,%20android.os.CancellationSignal)
590638
Future<void> validateSql(final String sql) {
591-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'sql': sql};
639+
final Map<String, dynamic> request = <String, dynamic>{
640+
'id': id,
641+
'sql': sql
642+
};
592643
return _channel.invokeMethod('validateSql', request);
593644
}
594645

@@ -606,8 +657,12 @@ abstract class SQLiteDatabase implements SQLiteClosable {
606657
/// started the transaction immediately.
607658
///
608659
/// See: https://developer.android.com/reference/android/database/sqlite/SQLiteDatabase#yieldIfContendedSafely()
609-
Future<bool> yieldIfContendedSafely([final int sleepAfterYieldDelay = 0]) async {
610-
final Map<String, dynamic> request = <String, dynamic>{'id': id, 'sleepAfterYieldDelay': sleepAfterYieldDelay};
660+
Future<bool> yieldIfContendedSafely(
661+
[final int sleepAfterYieldDelay = 0]) async {
662+
final Map<String, dynamic> request = <String, dynamic>{
663+
'id': id,
664+
'sleepAfterYieldDelay': sleepAfterYieldDelay
665+
};
611666
return await _channel.invokeMethod('yieldIfContendedSafely', request);
612667
}
613668
}

‎lib/src/query.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ import 'program.dart' show SQLiteProgram;
1010
abstract class SQLiteQuery extends SQLiteProgram {
1111
// TODO
1212
}
13-

0 commit comments

Comments
 (0)