[TiDB] Handle expected errors

malwaregarry · malwaregarry · commit 648bc945b2bd · 2024-10-02T13:56:06.000+08:00
diff --git a/src/sqlancer/tidb/TiDBSchema.java b/src/sqlancer/tidb/TiDBSchema.java
@@ -251,6 +251,7 @@ private static TiDBCompositeDataType getColumnType(String typeString) {
                 primitiveType = TiDBDataType.INT;
                 size = 1;
                 break;
+            case "tinyint(2)":
             case "tinyint(3)":
             case "tinyint(4)":
                 primitiveType = TiDBDataType.INT;
@@ -267,6 +268,7 @@ private static TiDBCompositeDataType getColumnType(String typeString) {
                 size = 4;
                 break;
             case "blob":
+            case "mediumblob":
             case "longblob":
             case "tinyblob":
                 primitiveType = TiDBDataType.BLOB;
diff --git a/src/sqlancer/tidb/gen/TiDBAnalyzeTableGenerator.java b/src/sqlancer/tidb/gen/TiDBAnalyzeTableGenerator.java
@@ -5,6 +5,7 @@
 import sqlancer.Randomly;
 import sqlancer.common.query.ExpectedErrors;
 import sqlancer.common.query.SQLQueryAdapter;
+import sqlancer.tidb.TiDBErrors;
 import sqlancer.tidb.TiDBProvider.TiDBGlobalState;
 import sqlancer.tidb.TiDBSchema.TiDBTable;
 
@@ -14,7 +15,7 @@ private TiDBAnalyzeTableGenerator() {
     }
 
     public static SQLQueryAdapter getQuery(TiDBGlobalState globalState) throws SQLException {
-        ExpectedErrors errors = new ExpectedErrors();
+        ExpectedErrors errors = ExpectedErrors.newErrors().with(TiDBErrors.getExpressionErrors()).build();
         TiDBTable table = globalState.getSchema().getRandomTable(t -> !t.isView());
         boolean analyzeIndex = !table.getIndexes().isEmpty() && Randomly.getBoolean();
         StringBuilder sb = new StringBuilder("ANALYZE TABLE ");
diff --git a/src/sqlancer/tidb/gen/TiDBDeleteGenerator.java b/src/sqlancer/tidb/gen/TiDBDeleteGenerator.java
@@ -18,7 +18,7 @@ private TiDBDeleteGenerator() {
     }
 
     public static SQLQueryAdapter getQuery(TiDBGlobalState globalState) throws SQLException {
-        ExpectedErrors errors = new ExpectedErrors();
+        ExpectedErrors errors = ExpectedErrors.newErrors().with(TiDBErrors.getExpressionErrors()).build();
         TiDBTable table = globalState.getSchema().getRandomTable(t -> !t.isView());
         TiDBExpressionGenerator gen = new TiDBExpressionGenerator(globalState).setColumns(table.getColumns());
         StringBuilder sb = new StringBuilder("DELETE ");

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ private TiDBDeleteGenerator() {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public static SQLQueryAdapter getQuery(TiDBGlobalState globalState) throws SQLException {`
`21`		`- ExpectedErrors errors = new ExpectedErrors();`
	`21`	`+ ExpectedErrors errors = ExpectedErrors.newErrors().with(TiDBErrors.getExpressionErrors()).build();`
`22`	`22`	`TiDBTable table = globalState.getSchema().getRandomTable(t -> !t.isView());`
`23`	`23`	`TiDBExpressionGenerator gen = new TiDBExpressionGenerator(globalState).setColumns(table.getColumns());`
`24`	`24`	`StringBuilder sb = new StringBuilder("DELETE ");`