tiny fix

codekeyz · Apr 28, 2024 · c26ee90 · c26ee90
1 parent 4b1622c
commit c26ee90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/src/database/driver/sqlite_driver.dart b/lib/src/database/driver/sqlite_driver.dart
@@ -207,9 +207,11 @@ class SqliteSerializer extends PrimitiveSerializer {
     final queryBuilder = StringBuffer();
 
     /// SELECT
-    final selectStatement = acceptSelect(query.fieldSelections.toList());
-    queryBuilder.write(selectStatement);
-    queryBuilder.write('FROM ${escapeStr(query.tableName)}');
+    final tableName = escapeStr(query.tableName);
+    final selectStatement = acceptSelect(tableName, query.fieldSelections.toList());
+    queryBuilder
+      ..write(selectStatement)
+      ..write('FROM $tableName');
 
     /// WHERE
     final whereClause = query.whereClause;
@@ -311,8 +313,10 @@ class SqliteSerializer extends PrimitiveSerializer {
   }
 
   @override
-  String acceptSelect(List<String> fields) {
-    return fields.isEmpty ? 'SELECT * ' : 'SELECT ${fields.map(escapeStr).join(', ')} ';
+  String acceptSelect(String tableName, List<String> fields) {
+    return fields.isEmpty
+        ? 'SELECT $tableName.* '
+        : 'SELECT ${fields.map((e) => '$tableName.${escapeStr(e)}').join(', ')} ';
   }
 
   @override

diff --git a/lib/src/primitives/serializer.dart b/lib/src/primitives/serializer.dart
@@ -20,7 +20,7 @@ abstract class PrimitiveSerializer {
 
   String acceptWhereClauseValue(WhereClauseValue clauseValue);
 
-  String acceptSelect(List<String> fields);
+  String acceptSelect(String tableName, List<String> fields);
 
   String acceptOrderBy(List<OrderBy> orderBys);