Merge pull request #8 from rko281/master

Fixes and Tests for Issues #5, #6 and #7

MySQL-Core-Tests-Integration/MySQLServerStatementFetchTest.class.st

@@ -54,6 +54,75 @@ MySQLServerStatementFetchTest >> testReadAllRowsAtATime [
 
 ]
 
+{ #category : #tests }
+MySQLServerStatementFetchTest >> testReadNextRowFetchAll [
+
+	"Test nextRow where fetch size is greater than data size"
+
+	| rs rd |
+
+	stmt fetchSize: 100.
+
+	stmt params: (Array with:  (MySQLBindParameter withValue: '2011-09-01')).
+	rs := stmt execute.
+	self assert: rs isResultSet; assert: rs hasOpenCursor; deny: rs hasLastRowSent.
+	10 timesRepeat:
+		[ rd := rs nextRow.
+		self deny: rd isNil ].
+
+	self assert: rs atEnd.
+	rd := rs nextRow.
+	self 
+		assert: rd isNil; 
+		assert: rs atEnd
+]
+
+{ #category : #tests }
+MySQLServerStatementFetchTest >> testReadNextRowFetchExact [
+
+	"Test nextRow where fetch size is same as data size"
+
+	| rs rd |
+
+	stmt fetchSize: 10.
+
+	stmt params: (Array with:  (MySQLBindParameter withValue: '2011-09-01')).
+	rs := stmt execute.
+	self assert: rs isResultSet; assert: rs hasOpenCursor; deny: rs hasLastRowSent.
+	10 timesRepeat:
+		[ rd := rs nextRow.
+		self deny: rd isNil ].
+
+	self assert: rs atEnd.
+	rd := rs nextRow.
+	self 
+		assert: rd isNil; 
+		assert: rs atEnd
+]
+
+{ #category : #tests }
+MySQLServerStatementFetchTest >> testReadNextRowFetchIncremental [
+
+	"Test nextRow where incremental fetches are needed"
+
+	| rs rd |
+
+	stmt fetchSize: 2.
+
+	stmt params: (Array with:  (MySQLBindParameter withValue: '2011-09-01')).
+	rs := stmt execute.
+	self assert: rs isResultSet; assert: rs hasOpenCursor; deny: rs hasLastRowSent.
+	10 timesRepeat:
+		[ rd := rs nextRow.
+		self deny: rd isNil ].
+
+	self assert: rs atEnd.
+	rd := rs nextRow.
+	self 
+		assert: rd isNil; 
+		assert: rs atEnd
+]
+
 { #category : #tests }
 MySQLServerStatementFetchTest >> testReadOneRowAtATime [
 	| rs rd |

MySQL-Core-Tests-Integration/MySQLServerStatementInputTest.class.st

@@ -180,6 +180,34 @@ MySQLServerStatementInputTest >> testAcceptPositiveIntegers [
 
 ]
 
+{ #category : #tests }
+MySQLServerStatementInputTest >> testInputDoubles [
+	| prep stmtId resp testVals params stmt |
+	prep := self connection
+		prepare:
+			'insert into 
+			testReals (floatValue, doubleValue, realValue) 
+			values (?, ?, ?)'.
+	stmtId := prep prepareOkay stmtHandlerId.
+	params := MySQLBindParameter
+		listOfSize: prep prepareOkay numParams
+		forDescriptors: prep paramDescriptors.
+	(testVals := #(0 1.0 4.2 4.25 4.5s6))
+		do: [ :val | 
+			params do: [ :param | param bindValue: val ].
+			stmt := MySQLDriverStatement onConnection: self connection.
+			stmt
+				stmtId: stmtId;
+				params: params.
+			resp := stmt execute.
+			self assert: resp isOkay.
+			self assert: resp affectedRows = 1 ].
+
+	(self connection query: 'select floatValue, doubleValue, realValue from testReals order by floatValue') rows with: testVals do: 
+		[ :row :val |
+		self assert: (row at: 1) asNumber equals: val]
+]
+
 { #category : #tests }
 MySQLServerStatementInputTest >> testInputParamExpectingNoResultSet [
 	| prep stmtId params resp stmt |
@@ -234,6 +262,34 @@ MySQLServerStatementInputTest >> testInputParamExpectingResultSet [
 
 ]
 
+{ #category : #tests }
+MySQLServerStatementInputTest >> testInputScaledDecimals [
+	| prep stmtId resp testVals params stmt |
+	prep := self connection
+		prepare:
+			'insert into 
+			testReals (decimalValue, numericValue) 
+			values (?, ?)'.
+	stmtId := prep prepareOkay stmtHandlerId.
+	params := MySQLBindParameter
+		listOfSize: prep prepareOkay numParams
+		forDescriptors: prep paramDescriptors.
+	(testVals := #(-1s6 0s6 1s6))
+		do: [ :val | 
+			params do: [ :param | param bindValue: val ].
+			stmt := MySQLDriverStatement onConnection: self connection.
+			stmt
+				stmtId: stmtId;
+				params: params.
+			resp := stmt execute.
+			self assert: resp isOkay.
+			self assert: resp affectedRows equals: 1 ].
+
+	(self connection query: 'select decimalValue, numericValue from testReals order by decimalValue') rows with: testVals do:
+		[ :row :val |
+		self assert: (row at: 1) asNumber equals: val]
+]
+
 { #category : #tests }
 MySQLServerStatementInputTest >> testInputTimeTypes [
 	| prep stmtId params stmt resp |

MySQL-Core-Tests-Integration/MySQLServerStatementReadStringTest.class.st

@@ -217,6 +217,13 @@ MySQLServerStatementReadStringTest >> testReadRealTypesNull [
 
 { #category : #tests }
 MySQLServerStatementReadStringTest >> testReadTimeTypes [
+
+	"From https://dev.mysql.com/doc/refman/8.0/en/datetime.html
+	'The offset is not displayed when selecting a datetime value [column 4], even if one was used when inserting it.'
+	This implies timestamps include the timezone offset, however the example SELECT results at that URL omits it.
+	Therefore we hedge our bets here with a 'beginsWith:' test"
+
+
 	| prep stmtId params resp stmt |
 	self withFixtures: #(#times) do: [:conn |
 		prep := conn prepare: 'select * from testTimes order by id'.
@@ -228,18 +235,18 @@ MySQLServerStatementReadStringTest >> testReadTimeTypes [
 
 		resp := stmt execute.
 		self assert: resp isResultSet.
-		self assert: resp rows size = 4.
-
-		self assert: (resp rows first atIndex: 2) = '2011-07-01'.
-		self assert: (resp rows first atIndex: 3) = '18:35:23'.
-		self assert: (resp rows first atIndex: 4) = '2011-07-02T10:12:45+00:00'.
-		self assert: (resp rows first atIndex: 5) = '1980-01-12T00:45:56+00:00'.
-		self assert: (resp rows first atIndex: 6) = '1999'.
-
-		self assert: (resp rows second atIndex: 2) = '2011-06-01'.
-		self assert: (resp rows second atIndex: 3) = '3:17:34:22'.
-		self assert: (resp rows second atIndex: 4) = '2011-06-02T09:11:44+00:00'.
-		self assert: (resp rows second atIndex: 5) = '1980-02-13T01:44:55+00:00']
+		self assert: resp rows size equals: 4.
+
+		self assert: (resp rows first atIndex: 2) equals: '2011-07-01'.
+		self assert: (resp rows first atIndex: 3) equals: '18:35:23'.
+		self assert: (resp rows first atIndex: 4) equals: '2011-07-02T10:12:45'.
+		self assert: ((resp rows first atIndex: 5) beginsWith: '1980-01-12T00:45:56').
+		self assert: (resp rows first atIndex: 6) equals: '1999'.
+
+		self assert: (resp rows second atIndex: 2) equals: '2011-06-01'.
+		self assert: (resp rows second atIndex: 3) equals: '3:17:34:22'.
+		self assert: (resp rows second atIndex: 4) equals: '2011-06-02T09:11:44'.
+		self assert: ((resp rows second atIndex: 5) beginsWith: '1980-02-13T01:44:55')]
 
 ]
 

MySQL-Core-Tests-Integration/MysqlDriverTest.class.st

@@ -1,6 +1,6 @@
 Class {
 	#name : #MySQLDriverTest,
-	#superclass : #TestCase,
+	#superclass : #MySQLTestCase,
 	#instVars : [
 		'connector'
 	],
@@ -22,12 +22,7 @@ MySQLDriverTest >> badConnectionSpec [
 
 { #category : #accessing }
 MySQLDriverTest >> goodConnectionSpec [
-	^ MySQLDriverSpec new
-		host: 'localhost';
-		port: 3306;
-		user: 'root';
-		password: '';
-		yourself
+	^ MySQLTestResource driverSpecNoDb
 ]
 
 { #category : #accessing }
@@ -93,12 +88,12 @@ MySQLDriverTest >> testConnectGood [
 MySQLDriverTest >> testConnectWithDb [
 	| connSpec resp |
 	connSpec := self goodConnectionSpec.
-	connSpec db: 'sodbxtest2'.
+	connSpec db: MySQLTestResource dbName.
 	resp := connector connect: connSpec.
 	self assert: resp isOkay.
 	connector disconnect.
 
-	connSpec db: 'sodbxtest2' reversed.
+	connSpec db: MySQLTestResource dbName reversed.
 	self assert: (connector connect: connSpec) isError.
 	connector connected ifTrue: [ connector disconnect].
 

MySQL-Core-Tests-Integration/MysqlTestResource.class.st

@@ -1,5 +1,10 @@
 "
-Test resource for MySQL testing
+Test resource for MySQL testing.
+
+Requires MySQL running on the localhost (or edit the ip in driverSpecNoDb) and the following user to be setup:
+
+create user 'sodbxtest'@'<test ip or *>' identified by 'sodbxtest';
+grant create, drop, create user, select, insert, update, delete  on *.*  to 'sodbxtest'@'<test ip or *>';
 "
 Class {
 	#name : #MySQLTestResource,

MySQL-Core-Tests/MySQLBindParameterDateTimeTest.class.st

@@ -7,6 +7,12 @@ Class {
 	#category : #'MySQL-Core-Tests-Utilities'
 }
 
+{ #category : #tests }
+MySQLBindParameterDateTimeTest >> expectedFailures [ 
+
+	^super expectedFailures, #(#testParamTimestamp )
+]
+
 { #category : #running }
 MySQLBindParameterDateTimeTest >> setUp [
 	theParam := MySQLBindParameter new.
@@ -60,6 +66,10 @@ MySQLBindParameterDateTimeTest >> testParamTime [
 
 { #category : #tests }
 MySQLBindParameterDateTimeTest >> testParamTimestamp [
+
+	"Currently an expected failure - this directly contradicts testParamDateTime.
+	Needs an explicit Timestamp class to map to MySQL typeTIMESTAMP"
+
 	theParam bindValue: DateAndTime current.
 	self assert: (theParam detectParamType = MySQLTypes typeTIMESTAMP).
 	self assert: theParam isUnsigned.

MySQL-Core-Tests/MySQLBindParameterRealTest.class.st

@@ -47,11 +47,11 @@ MySQLBindParameterRealTest >> testParamDouble [
 { #category : #tests }
 MySQLBindParameterRealTest >> testParamFloat [
 	theParam bindValue: 65.0.
-	self assert: theParam paramType = MySQLTypes typeFLOAT.
+	self assert: theParam paramType = MySQLTypes typeDOUBLE.
 	self assert: theParam isUnsigned.
 
 	theParam bindValue: -65.0.
-	self assert: theParam paramType = MySQLTypes typeFLOAT.
+	self assert: theParam paramType = MySQLTypes typeDOUBLE.
 	self deny: theParam isUnsigned.
 
 ]
@@ -67,11 +67,11 @@ MySQLBindParameterRealTest >> testParamFraction [
 	self deny: theParam isUnsigned.
 
 	theParam bindValue: 17/4.
-	self assert: theParam paramType = MySQLTypes typeFLOAT.
+	self assert: theParam paramType = MySQLTypes typeDOUBLE.
 	self assert: theParam isUnsigned.
 
 	theParam bindValue: -17/4.
-	self assert: theParam paramType = MySQLTypes typeFLOAT.
+	self assert: theParam paramType = MySQLTypes typeDOUBLE.
 	self deny: theParam isUnsigned.
 
 ]
@@ -81,7 +81,7 @@ MySQLBindParameterRealTest >> testStoreBinarySignedDecimal [
 	theParam bindValue: -12345.678901s6.
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
-		self assert: (strm contents asString = '12345.678901')]	
+		self assert: (strm contents asString = ((String with: (Character value: 13 "Length")), '-12345.678901'))]	
 ]
 
 { #category : #tests }
@@ -91,7 +91,7 @@ MySQLBindParameterRealTest >> testStoreBinarySignedDouble [
 		theParam storeBinaryOn: strm.
 		self assert: (strm contents 
 			hasEqualElements: 
-				(MySQLHelper bytesFromHexString: 'B4697BC3F105CDBA'))]
+				(MySQLHelper bytesFromHexString: 'F105CDBAB4697BC3'))]
 
 ]
 
@@ -101,7 +101,7 @@ MySQLBindParameterRealTest >> testStoreBinarySignedFraction [
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
 		self assert: (strm contents 
-			hasEqualElements: (MySQLHelper bytesFromHexString: '000011C0'))]
+			hasEqualElements: (MySQLHelper bytesFromHexString: '00000000000011C0'))]
 
 ]
 
@@ -111,7 +111,7 @@ MySQLBindParameterRealTest >> testStoreBinarySingedFloat [
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
 		self assert: (strm contents 
-			hasEqualElements: (MySQLHelper bytesFromHexString: '004050C0'))]
+			hasEqualElements: (MySQLHelper bytesFromHexString: '00000000004050C0'))]
 
 ]
 
@@ -120,7 +120,7 @@ MySQLBindParameterRealTest >> testStoreBinaryUnsignedDecimal [
 	theParam bindValue: 12345.678901s6.
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
-		self assert: (strm contents asString = '12345.678901')]	
+		self assert: (strm contents asString = ((String with: (Character value: 12 "Length")), '12345.678901'))]	
 ]
 
 { #category : #tests }
@@ -129,7 +129,7 @@ MySQLBindParameterRealTest >> testStoreBinaryUnsignedDouble [
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
 		self assert: (strm contents 
-			hasEqualElements: (MySQLHelper bytesFromHexString: 'B4697B43F105CDBA'))]
+			hasEqualElements: (MySQLHelper bytesFromHexString: 'F105CDBAB4697B43'))]
 
 ]
 
@@ -139,7 +139,7 @@ MySQLBindParameterRealTest >> testStoreBinaryUnsignedFloat [
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
 		self assert: (strm contents 
-			hasEqualElements: (MySQLHelper bytesFromHexString: '00405040'))]
+			hasEqualElements: (MySQLHelper bytesFromHexString: '0000000000405040'))]
 
 ]
 
@@ -149,6 +149,6 @@ MySQLBindParameterRealTest >> testStoreBinaryUnsignedFraction [
 	ByteArray streamContents: [:strm | 
 		theParam storeBinaryOn: strm.
 		self assert: (strm contents 
-			hasEqualElements: (MySQLHelper bytesFromHexString: '00001140'))]
+			hasEqualElements: (MySQLHelper bytesFromHexString: '0000000000001140'))]
 
 ]