From 8ddba55e43e28132fbff975670b4013c371163be Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 13 May 2025 11:47:51 +0200 Subject: [PATCH] lib/util: move `escapeStringValue` to sqlite utils --- lib/search/word_search.dart | 9 +++------ lib/util/sqlite_utils.dart | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 lib/util/sqlite_utils.dart diff --git a/lib/search/word_search.dart b/lib/search/word_search.dart index 65e9854..6910c40 100644 --- a/lib/search/word_search.dart +++ b/lib/search/word_search.dart @@ -10,6 +10,7 @@ import 'package:jadb/models/word_search/word_search_ruby.dart'; import 'package:jadb/models/word_search/word_search_sense.dart'; import 'package:jadb/models/word_search/word_search_sources.dart'; import 'package:jadb/models/word_search/word_search_xref_entry.dart'; +import 'package:jadb/util/sqlite_utils.dart'; import 'package:sqflite_common/sqlite_api.dart'; // TODO: Support globs @@ -20,10 +21,6 @@ import 'package:sqflite_common/sqlite_api.dart'; // TODO: Support mixing kana and romaji -String _escapeStringValue(String value) { - return "'" + value.replaceAll("'", "''") + "'"; -} - Future?> searchWordWithDbConnection( DatabaseExecutor connection, String word, { @@ -171,7 +168,7 @@ Future?> searchWordWithDbConnection( final readingIds = readingElements .map((element) => ( element['entryId'] as int, - _escapeStringValue(element['reading'] as String) + escapeStringValue(element['reading'] as String) )) .toList(); @@ -194,7 +191,7 @@ Future?> searchWordWithDbConnection( final kanjiIds = kanjiElements .map((element) => ( element['entryId'] as int, - _escapeStringValue(element['reading'] as String) + escapeStringValue(element['reading'] as String) )) .toList(); diff --git a/lib/util/sqlite_utils.dart b/lib/util/sqlite_utils.dart new file mode 100644 index 0000000..08ad633 --- /dev/null +++ b/lib/util/sqlite_utils.dart @@ -0,0 +1,3 @@ +String escapeStringValue(String value) { + return "'" + value.replaceAll("'", "''") + "'"; +}