fix(android): explicit ordering for queries

autoreleasefool · Sep 4, 2024 · 3c1342e · 3c1342e
1 parent 01dc798
commit 3c1342e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...core/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/AlleyDao.kt b/...core/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/AlleyDao.kt
@@ -27,7 +27,7 @@ abstract class AlleyDao {
 				alleys.mechanism AS mechanism,
 				alleys.pin_base AS pinBase
 			FROM alleys
-			ORDER BY alleys.name
+			ORDER BY alleys.name ASC
 		""",
 	)
 	abstract fun getAlleysList(): Flow<List<AlleyListItem>>

diff --git a/...ore/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/BowlerDao.kt b/...ore/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/BowlerDao.kt
@@ -96,7 +96,7 @@ abstract class BowlerDao : LegacyMigratingDao<BowlerEntity> {
 				bowlers.kind AS kind
 			FROM bowlers
 			WHERE bowlers.archived_on IS NULL
-			ORDER BY bowlers.name
+			ORDER BY bowlers.name ASC
 		""",
 	)
 	abstract fun getOpponentsList(): Flow<List<OpponentListItem>>

diff --git a/.../core/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/GearDao.kt b/.../core/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/GearDao.kt
@@ -33,7 +33,7 @@ abstract class GearDao {
 				AND bowler_preferred_gear.bowler_id = :bowlerId
 			LEFT JOIN bowlers AS owner 
 				ON gear.owner_id = owner.id
-			ORDER BY gear.name
+			ORDER BY gear.name ASC
 		""",
 	)
 	abstract fun getBowlerPreferredGear(bowlerId: BowlerID): Flow<List<GearListItem>>
@@ -52,7 +52,7 @@ abstract class GearDao {
 				AND game_gear.game_id = :gameId
 			LEFT JOIN bowlers AS owner
 				ON gear.owner_id = owner.id
-			ORDER BY gear.name
+			ORDER BY gear.name ASC
 		""",
 	)
 	abstract fun getGameGear(gameId: GameID): Flow<List<GearListItem>>
@@ -69,7 +69,7 @@ abstract class GearDao {
 			LEFT JOIN bowlers AS owner
 				ON gear.owner_id = owner.id
 			WHERE (:kind IS NULL OR gear.kind = :kind)
-			ORDER BY gear.name
+			ORDER BY gear.name ASC
 		""",
 	)
 	abstract fun getGearList(kind: GearKind? = null): Flow<List<GearListItem>>

diff --git a/.../core/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/LaneDao.kt b/.../core/database/src/main/java/ca/josephroque/bowlingcompanion/core/database/dao/LaneDao.kt
@@ -21,7 +21,7 @@ abstract class LaneDao {
 				lanes.position AS position
 			FROM lanes
 			WHERE lanes.id IN (:ids)
-			ORDER BY lanes.label
+			ORDER BY lanes.label * 1 ASC
 		""",
 	)
 	abstract fun getLanes(ids: List<LaneID>): Flow<List<LaneListItem>>
@@ -34,7 +34,7 @@ abstract class LaneDao {
 				lanes.position AS position
 			FROM lanes
 			WHERE lanes.alley_id = :alleyId
-			ORDER BY lanes.label * 1
+			ORDER BY lanes.label * 1 ASC
 		""",
 	)
 	abstract fun getAlleyLanes(alleyId: AlleyID): Flow<List<LaneListItem>>
@@ -48,7 +48,7 @@ abstract class LaneDao {
 			FROM lanes
 			JOIN game_lanes ON game_lanes.lane_id = lanes.id
 			WHERE game_lanes.game_id = :gameId
-			ORDER BY lanes.label * 1
+			ORDER BY lanes.label * 1 ASC
 		""",
 	)
 	abstract fun getGameLanes(gameId: GameID): Flow<List<LaneListItem>>