Merge pull request #2225 from actiontech/fix-issue2208

check single index

Author: ColdWaterLW

sqle/driver/mysql/audit_test.go

@@ -7198,7 +7198,7 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "select-without-equal",
 			Sql:         `select * from exist_tb_9 where v3 > 1`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		{
 			Name:        "select-without-equal",
@@ -7213,7 +7213,7 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "select-without-equal",
 			Sql:         `select * from exist_tb_9 where v3 in(1,2)`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		{
 			Name:        "select-subquery",
@@ -7274,7 +7274,7 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "update-without-equal",
 			Sql:         `update exist_tb_9 set v4 = 1 where v3 > 1`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		{
 			Name:        "update-without-equal",
@@ -7289,7 +7289,7 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "update-without-equal",
 			Sql:         `update exist_tb_9 set v4 = 1 where v3 in(1,2)`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		// delete
 		{
@@ -7330,7 +7330,7 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "delete-without-equal",
 			Sql:         `delete from exist_tb_9 where v3 > 1`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		{
 			Name:        "delete-without-equal",
@@ -7350,7 +7350,7 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "delete-without-equal",
 			Sql:         `delete from exist_tb_9 where v3 in(1,2)`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		// select union
 		{
@@ -7382,13 +7382,23 @@ func TestMustUseLeftMostPrefix(t *testing.T) {
 		{
 			Name:        "select-subquery",
 			Sql:         `select * from (select * from exist_tb_8) t left join exist_tb_9 t1 on t.id=t1.id where t1.v3=1`,
-			TriggerRule: true,
+			TriggerRule: false,
 		},
 		{
 			Name:        "select-subquery",
 			Sql:         `select * from (select * from exist_tb_9) t left join exist_tb_8 t1 on t.id=t1.id where t.v3=1`,
 			TriggerRule: false,
 		},
+		{
+			Name:        "select use single index",
+			Sql:         `select * from exist_tb_9 where v3=100`,
+			TriggerRule: false,
+		},
+		{
+			Name:        "select use single index",
+			Sql:         `select * from exist_tb_9 where v3 > 100`,
+			TriggerRule: false,
+		},
 	}
 
 	rule := rulepkg.RuleHandlerMap[rulepkg.DMLMustUseLeftMostPrefix].Rule

sqle/driver/mysql/rule/rule.go

@@ -5390,10 +5390,23 @@ func isColumnMatchedALeftMostPrefix(allCols []string, colsWithEQ, colsWithOr []s
 	return true
 }
 
+func checkSingleIndex(allCols []string, constraint *ast.Constraint) bool {
+	singleIndexColumn := constraint.Keys[0].Column.Name.L
+	for _, col := range allCols {
+		if col == singleIndexColumn {
+			return true
+		}
+	}
+	return false
+}
+
 func isColumnUseLeftMostPrefix(allCols []string, constraints []*ast.Constraint) bool {
 	multiConstraints := make([]*ast.Constraint, 0)
 	for _, constraint := range constraints {
 		if len(constraint.Keys) == 1 {
+			if checkSingleIndex(allCols, constraint) {
+				return true
+			}
 			continue
 		}
 		multiConstraints = append(multiConstraints, constraint)