Merge pull request #46 from pharo-rdbms/order-by-patch

Fix orderBy not accepting blocks
pharo-rdbms · Sep 22, 2021 · e0ff6a1 · e0ff6a1
2 parents 37cb474 + 5c32cde
commit e0ff6a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Glorp-Integration-Tests/GlorpQueryUnionTest.class.st b/Glorp-Integration-Tests/GlorpQueryUnionTest.class.st
@@ -144,9 +144,9 @@ GlorpQueryUnionTest >> testCreateCompoundExpressionOnSQLite3 [
 	self
 		assert: compoundString
 		equals:
-			'SELECT DISTINCT * FROM ((SELECT t1.ID, t1.STREET, t1.HOUSE_NUM
- FROM GR_ADDRESS t1) UNION ALL (SELECT t1.ID, t1.STREET, t1.HOUSE_NUM
- FROM GR_ADDRESS t1)) t1'
+			'SELECT DISTINCT * FROM (SELECT t1.ID, t1.STREET, t1.HOUSE_NUM
+ FROM GR_ADDRESS t1 UNION ALL SELECT t1.ID, t1.STREET, t1.HOUSE_NUM
+ FROM GR_ADDRESS t1) t1'
 ]
 
 { #category : #'tests-unit' }

diff --git a/Glorp/ToManyMapping.class.st b/Glorp/ToManyMapping.class.st
@@ -32,7 +32,9 @@ ToManyMapping >> buildQuery [
 	query := super buildQuery.
 	orderBy ifNotNil: [ orderBy do: [ :each || attr |
 			each isString 
-				ifTrue: [ query orderBy: each asSymbol ]
+				ifTrue: [ query orderBy: each asSymbol ].
+			each isBlock 
+				ifTrue: [ query orderBy: each ]
 				ifFalse: [  
 					attr := targetDescriptor directMappingForField: each.
 					attr notNil ifTrue: [ query orderBy: attr attributeName ] ] ] ].