Test MariaDB 10.3. Fixes #504

Instead of adding a new ServerFeatures flag controlling whether 'SELECT 1;' is expected to return Int32 or Int64, permit either and perform a conversion where necessary. (There are other tests that will ensure data types are transmitted/parsed correctly.)

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

.travis.yml

@@ -18,6 +18,9 @@ env:
   - IMAGE=mariadb:10.2
     NAME=mariadb
     OMIT_FEATURES=Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin
+  - IMAGE=mariadb:10.3
+    NAME=mariadb
+    OMIT_FEATURES=Json,Sha256Password,CachingSha2Password,RoundDateTime,UuidToBin
 
 before_install:
 - .ci/docker-run.sh $IMAGE $NAME 3307 $OMIT_FEATURES

tests/SideBySide/CancelTests.cs

@@ -28,8 +28,7 @@ public void NoCancel()
 			using (var cmd = new MySqlCommand("SELECT SLEEP(0.25)", m_database.Connection))
 			{
 				var stopwatch = Stopwatch.StartNew();
-				var result = (long) cmd.ExecuteScalar();
-				Assert.Equal(0L, result);
+				Assert.Equal(0L, Convert.ToInt64(cmd.ExecuteScalar()));
 				Assert.InRange(stopwatch.ElapsedMilliseconds, 100, 1000);
 			}
 		}
@@ -46,8 +45,7 @@ public void CancelCommand()
 				});
 
 				var stopwatch = Stopwatch.StartNew();
-				var result = (long) cmd.ExecuteScalar();
-				Assert.Equal(1L, result);
+				TestUtilities.AssertIsOne(cmd.ExecuteScalar());
 				Assert.InRange(stopwatch.ElapsedMilliseconds, 250, 2500);
 
 				task.Wait(); // shouldn't throw

tests/SideBySide/CommandTests.cs

@@ -114,7 +114,7 @@ public void CommandTransactionMustBeSet()
 					Assert.Throws<InvalidOperationException>(() => command.ExecuteScalar());
 
 					command.Transaction = transaction;
-					Assert.Equal(1L, command.ExecuteScalar());
+					TestUtilities.AssertIsOne(command.ExecuteScalar());
 				}
 			}
 		}
@@ -129,7 +129,7 @@ public void IgnoreCommandTransactionIgnoresNull()
 				using (var command = connection.CreateCommand())
 				{
 					command.CommandText = "SELECT 1;";
-					Assert.Equal(1L, command.ExecuteScalar());
+					TestUtilities.AssertIsOne(command.ExecuteScalar());
 				}
 			}
 		}
@@ -149,7 +149,7 @@ public void IgnoreCommandTransactionIgnoresDisposedTransaction()
 				{
 					command.CommandText = "SELECT 1;";
 					command.Transaction = transaction;
-					Assert.Equal(1L, command.ExecuteScalar());
+					TestUtilities.AssertIsOne(command.ExecuteScalar());
 				}
 			}
 		}
@@ -167,7 +167,7 @@ public void IgnoreCommandTransactionIgnoresDifferentTransaction()
 				{
 					command2.Transaction = transaction1;
 					command2.CommandText = "SELECT 1;";
-					Assert.Equal(1L, command2.ExecuteScalar());
+					TestUtilities.AssertIsOne(command2.ExecuteScalar());
 				}
 			}
 		}

tests/SideBySide/DataAdapterTests.cs

@@ -49,7 +49,7 @@ public void UseDataAdapter()
 				Assert.Single(ds.Tables);
 				Assert.Single(ds.Tables[0].Rows);
 				Assert.Single(ds.Tables[0].Rows[0].ItemArray);
-				Assert.Equal(1L, ds.Tables[0].Rows[0][0]);
+				TestUtilities.AssertIsOne(ds.Tables[0].Rows[0][0]);
 			}
 		}
 
@@ -61,7 +61,7 @@ public void UseDataAdapterMySqlConnectionConstructor()
 			using (var ds = new DataSet())
 			{
 				da.Fill(ds);
-				Assert.Equal(1L, ds.Tables[0].Rows[0][0]);
+				TestUtilities.AssertIsOne(ds.Tables[0].Rows[0][0]);
 			}
 		}
 
@@ -72,8 +72,7 @@ public void UseDataAdapterStringMySqlConnectionConstructor()
 			using (var ds = new DataSet())
 			{
 				da.Fill(ds);
-				Assert.Equal(1L, ds.Tables[0].Rows[0][0]);
-				Assert.Equal(1L, ds.Tables[0].Rows[0][0]);
+				TestUtilities.AssertIsOne(ds.Tables[0].Rows[0][0]);
 			}
 		}
 
@@ -84,7 +83,7 @@ public void UseDataAdapterStringStringConstructor()
 			using (var ds = new DataSet())
 			{
 				da.Fill(ds);
-				Assert.Equal(1L, ds.Tables[0].Rows[0][0]);
+				TestUtilities.AssertIsOne(ds.Tables[0].Rows[0][0]);
 			}
 		}
 

tests/SideBySide/QueryTests.cs

@@ -502,14 +502,14 @@ id bigint(20) not null primary key
 		public void ExecuteScalarReturnsFirstValue()
 		{
 			var result = m_database.Connection.ExecuteScalar("select 1; select 2;");
-			Assert.Equal(1L, result);
+			TestUtilities.AssertIsOne(result);
 		}
 
 		[Fact]
 		public async Task ExecuteScalarAsyncReturnsFirstValue()
 		{
 			var result = await m_database.Connection.ExecuteScalarAsync("select 1; select 2;");
-			Assert.Equal(1L, result);
+			TestUtilities.AssertIsOne(result);
 		}
 
 		[Fact]
@@ -649,8 +649,8 @@ public void UseReaderWithoutDisposing()
 		[InlineData("null", typeof(object))]
 #endif
 		[InlineData("cast(null as char)", typeof(string))]
-		[InlineData("1", typeof(long))]
-		[InlineData("cast(1 as unsigned)", typeof(ulong))]
+		[InlineData("1000000000000", typeof(long))]
+		[InlineData("cast(1000000000000 as unsigned)", typeof(ulong))]
 		[InlineData("1.0", typeof(decimal))]
 		[InlineData("'text'", typeof(string))]
 		[InlineData("cast('text' as char(4))", typeof(string))]
@@ -679,8 +679,8 @@ public void GetFieldType(string value, Type expectedType)
 		[InlineData("null", "NULL")]
 #endif
 		[InlineData("cast(null as char)", "VARCHAR")]
-		[InlineData("1", "BIGINT")]
-		[InlineData("cast(1 as unsigned)", "BIGINT")]
+		[InlineData("1000000000000", "BIGINT")]
+		[InlineData("cast(1000000000000 as unsigned)", "BIGINT")]
 		[InlineData("1.0", "DECIMAL")]
 		[InlineData("'text'", "VARCHAR")]
 		[InlineData("cast('2000-01-02' as date)", "DATE")]
@@ -890,7 +890,7 @@ public void ReturnDerivedTypes()
 				using (MySqlDataReader reader = command.ExecuteReader())
 				{
 					Assert.True(reader.Read());
-					Assert.Equal(3L, reader.GetValue(0));
+					Assert.Equal(3L, Convert.ToInt64(reader.GetValue(0)));
 					Assert.False(reader.Read());
 				}
 

tests/SideBySide/TestUtilities.cs

@@ -22,6 +22,27 @@ public static void AssertEqual(byte[] expected, byte[] actual)
 			}
 		}
 
+		/// <summary>
+		/// Verifies that <paramref name="value"/> is an integer (<see cref="Int32"/> or <see cref="Int64"/>) with the value <code>1</code>.
+		/// </summary>
+		public static void AssertIsOne(object value)
+		{
+			switch (value)
+			{
+			case int intValue:
+				Assert.Equal(1, intValue);
+				break;
+
+			case long longValue:
+				Assert.Equal(1L, longValue);
+				break;
+
+			default:
+				Assert.Equal(1L, value);
+				break;
+			}
+		}
+
 		/// <summary>
 		/// Asserts that <paramref name="stopwatch"/> is in the range [minimumMilliseconds, minimumMilliseconds + lengthMilliseconds].
 		/// </summary>