chore: Fix field selections (#83)

* fix field selections * _ * bump orm version * _
codekeyz · Nov 5, 2024 · 04546ad · 04546ad
1 parent bd66e52
commit 04546ad
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.0.4
+
+- Make Entity a mixin.
+- Fixed orderBy query.
+- Minor improvements.
+
 ## 0.0.3
 
 - Separate code-gen package from yaroorm.

diff --git a/lib/src/database/driver/sqlite_driver.dart b/lib/src/database/driver/sqlite_driver.dart
@@ -241,7 +241,7 @@ class SqliteSerializer extends PrimitiveSerializer {
     /// ORDER BY
     final orderBys = query.orderByProps ?? {};
     if (orderBys.isNotEmpty) {
-      queryBuilder.write(' ORDER BY ${acceptOrderBy(orderBys.toList())}');
+      queryBuilder.write(' ORDER BY ${acceptOrderBy(tableName, orderBys.toList())}');
     }
 
     /// LIMIT
@@ -341,9 +341,9 @@ class SqliteSerializer extends PrimitiveSerializer {
   }
 
   @override
-  String acceptOrderBy(List<OrderBy> orderBys) {
+  String acceptOrderBy(String tableName, List<OrderBy> orderBys) {
     direction(OrderDirection dir) => dir == OrderDirection.asc ? 'ASC' : 'DESC';
-    return orderBys.map((e) => '${e.field} ${direction(e.direction)}').join(', ');
+    return orderBys.map((e) => '$tableName.${escapeStr(e.field)} ${direction(e.direction)}').join(', ');
   }
 
   @override

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

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: yaroorm
 description: Easy migrations, query-builder & ORM for Postgres, SQLite, MySQL & MariaDB.
-version: 0.0.3+2
+version: 0.0.4
 homepage: https://docs.yaroo.dev/orm/quickstart
 repository: https://github.com/codekeyz/yaroo