Skip to content

Commit dde2821

Browse files
committed
Remove some GetSchemaTable workarounds.
These bugs were fixed in MySql.Data 6.9.11.
1 parent 367a755 commit dde2821

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

tests/SideBySide/DataTypes.cs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -812,17 +812,9 @@ public void GetSchemaTable(string column, string table, MySqlDbType mySqlDbType,
812812
DoGetSchemaTable(column, table, mySqlDbType, columnSize, dataType, flags, precision, scale);
813813

814814
[Theory]
815-
[InlineData("`decimal-type` decimal(10,0) NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 11, typeof(decimal), "", 10, 0
816-
#if BASELINE
817-
, Skip = "https://bugs.mysql.com/bug.php?id=88058"
818-
#endif
819-
)]
815+
[InlineData("`decimal-type` decimal(10,0) NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 11, typeof(decimal), "", 10, 0)]
820816
[InlineData("`decimal-type` decimal(10,1) NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 12, typeof(decimal), "", 10, 1)]
821-
[InlineData("`decimal-type` decimal(10,0) UNSIGNED NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 10, typeof(decimal), "", 10, 0
822-
#if BASELINE
823-
, Skip = "https://bugs.mysql.com/bug.php?id=88058"
824-
#endif
825-
)]
817+
[InlineData("`decimal-type` decimal(10,0) UNSIGNED NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 10, typeof(decimal), "", 10, 0)]
826818
[InlineData("`decimal-type` decimal(10,1) UNSIGNED NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 11, typeof(decimal), "", 10, 1)]
827819
[InlineData("`decimal-type` decimal(65,30) NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 67, typeof(decimal), "", 65, 30)]
828820
[InlineData("`decimal-type` decimal(1,1) NOT NULL", "decimal-type", MySqlDbType.NewDecimal, 3, typeof(decimal), "", 1, 1)]
@@ -861,18 +853,13 @@ private void DoGetSchemaTable(string column, string table, MySqlDbType mySqlDbTy
861853
Assert.Equal(ordinal, schema["ColumnOrdinal"]);
862854
Assert.Equal(dataType, schema["DataType"]);
863855
#if BASELINE
864-
// https://bugs.mysql.com/bug.php?id=87868, https://bugs.mysql.com/bug.php?id=87876
865-
if (!column.EndsWith("blob", StringComparison.OrdinalIgnoreCase) && column != "text" && dataType != typeof(Guid) && columnSize != int.MaxValue)
856+
// https://bugs.mysql.com/bug.php?id=87876
857+
if (columnSize != int.MaxValue)
866858
Assert.Equal(columnSize, schema["ColumnSize"]);
867859
#else
868860
Assert.Equal(columnSize, schema["ColumnSize"]);
869861
#endif
870-
#if BASELINE
871-
// https://bugs.mysql.com/bug.php?id=87876
872-
Assert.Equal(isLong && columnSize != int.MaxValue, schema["IsLong"]);
873-
#else
874862
Assert.Equal(isLong, schema["IsLong"]);
875-
#endif
876863
Assert.Equal(isAutoIncrement, schema["IsAutoIncrement"]);
877864
Assert.Equal(isKey, schema["IsKey"]);
878865
Assert.Equal(allowDbNull, schema["AllowDBNull"]);

0 commit comments

Comments
 (0)