Fix #114

pharo-rdbms · Jun 26, 2023 · 94e1168 · 94e1168
1 parent d926665
commit 94e1168
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/src/Glorp/AbstractReadQuery.class.st b/src/Glorp/AbstractReadQuery.class.st
@@ -231,13 +231,18 @@ AbstractReadQuery >> defaultTracing [
 
 { #category : #executing }
 AbstractReadQuery >> deleteFromDatabaseWithParameters: anArray [
+
 	| command |
-	self descriptor classesRequiringIndependentQueries size >1 ifTrue: [self error: 'Delete with where clause not yet supported for classes that cross tables.'].
-	(self class includesBehavior: SimpleQuery) ifFalse: [self error: 'Non-simple queries not yet supported for deletes with where clauses'].
+	self descriptor classesRequiringIndependentQueries size > 1 ifTrue: [
+		self error:
+			'Delete with where clause not yet supported for classes that cross tables.' ].
+	(self class includesBehavior: SimpleQuery) ifFalse: [
+		self error:
+			'Non-simple queries not yet supported for deletes with where clauses' ].
 	command := self deleteSqlWith: anArray.
 	"Should this duplicate the error handling in rowsFromDatabasewithParameters:?"
 	session accessor executeCommand: command returnCursor: false.
-	^command rowCount.
+	^ command rowCount
 ]
 
 { #category : #executing }

diff --git a/src/Glorp/ActiveRecordQuery.class.st b/src/Glorp/ActiveRecordQuery.class.st
@@ -9,18 +9,6 @@ Class {
 	#category : #'Glorp-ActiveRecord'
 }
 
-{ #category : #executing }
-ActiveRecordQuery >> deleteFromDatabaseWithParameters: anArray [
-	| command |
-	self descriptor classesRequiringIndependentQueries size >1 ifTrue: [self error: 'Delete with where clause not yet supported for classes that cross tables.'].
-	(self class includesBehavior: SimpleQuery) ifFalse: [self error: 'Non-simple queries not yet supported for deletes with where clauses'].
-	self halt.
-	command := self deleteSqlWith: anArray.
-	"Should this duplicate the error handling in rowsFromDatabasewithParameters:?"
-	session accessor executeCommand: command returnCursor: false.
-	^command rowCount.
-]
-
 { #category : #accessing }
 ActiveRecordQuery >> session: aSession [
 	super session: aSession.