fixed test

Author: zachmu

sql/index_builder_test.go

@@ -46,88 +46,88 @@ func TestIndexBuilderRanges(t *testing.T) {
 	t.Run("IsNull,Equals2=EmptyRange", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
 		builder = builder.IsNull(ctx, "column_0")
-		builder = builder.Equals(ctx, "column_0", 2)
+		builder = builder.Equals(ctx, "column_0", nil, 2)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.EmptyRangeColumnExpr(types.Int8)}}, ranges)
 	})
 
 	t.Run("NotEquals2=(NULL,2),(2,Inf)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.NotEquals(ctx, "column_0", 2)
+		builder = builder.NotEquals(ctx, "column_0", nil,2)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.GreaterThanRangeColumnExpr(int8(2), types.Int8)}, sql.MySQLRange{sql.LessThanRangeColumnExpr(int8(2), types.Int8)}}, ranges)
 	})
 
 	t.Run("NotEquals2,Equals2=(Inf,Inf)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.NotEquals(ctx, "column_0", 2)
-		builder = builder.Equals(ctx, "column_0", 2)
+		builder = builder.NotEquals(ctx, "column_0", nil,2)
+		builder = builder.Equals(ctx, "column_0", nil, 2)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.EmptyRangeColumnExpr(types.Int8)}}, ranges)
 	})
 
 	t.Run("Equals2,NotEquals2=(Inf,Inf)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.Equals(ctx, "column_0", 2)
-		builder = builder.NotEquals(ctx, "column_0", 2)
+		builder = builder.Equals(ctx, "column_0", nil, 2)
+		builder = builder.NotEquals(ctx, "column_0", nil, 2)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.EmptyRangeColumnExpr(types.Int8)}}, ranges)
 	})
 
 	t.Run("LT4=(NULL,4)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.LessThan(ctx, "column_0", 4)
+		builder = builder.LessThan(ctx, "column_0", nil, 4)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.LessThanRangeColumnExpr(int8(4), types.Int8)}}, ranges)
 	})
 
 	t.Run("GT2,LT4=(2,4)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.GreaterThan(ctx, "column_0", 2)
-		builder = builder.LessThan(ctx, "column_0", 4)
+		builder = builder.GreaterThan(ctx, "column_0", nil, 2)
+		builder = builder.LessThan(ctx, "column_0", nil, 4)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.OpenRangeColumnExpr(int8(2), int8(4), types.Int8)}}, ranges)
 	})
 
 	t.Run("GT2,GT6=(4,Inf)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.GreaterThan(ctx, "column_0", 2)
-		builder = builder.GreaterThan(ctx, "column_0", 6)
+		builder = builder.GreaterThan(ctx, "column_0", nil,2)
+		builder = builder.GreaterThan(ctx, "column_0", nil, 6)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.GreaterThanRangeColumnExpr(int8(6), types.Int8)}}, ranges)
 	})
 
 	t.Run("GT2,LT4,GT6=(Inf,Inf)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.GreaterThan(ctx, "column_0", 2)
-		builder = builder.LessThan(ctx, "column_0", 4)
-		builder = builder.GreaterThan(ctx, "column_0", 6)
+		builder = builder.GreaterThan(ctx, "column_0", nil, 2)
+		builder = builder.LessThan(ctx, "column_0", nil, 4)
+		builder = builder.GreaterThan(ctx, "column_0", nil, 6)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.EmptyRangeColumnExpr(types.Int8)}}, ranges)
 	})
 
 	t.Run("NotEqual2,NotEquals4=(2,4),(4,Inf),(NULL,2)", func(t *testing.T) {
 		builder := sql.NewMySQLIndexBuilder(testIndex{1})
-		builder = builder.NotEquals(ctx, "column_0", 2)
-		builder = builder.NotEquals(ctx, "column_0", 4)
+		builder = builder.NotEquals(ctx, "column_0", nil, 2)
+		builder = builder.NotEquals(ctx, "column_0", nil, 4)
 		ranges := builder.Ranges(ctx)
 		assert.NotNil(t, ranges)
 		assert.Equal(t, sql.MySQLRangeCollection{sql.MySQLRange{sql.OpenRangeColumnExpr(int8(2), int8(4), types.Int8)}, sql.MySQLRange{sql.GreaterThanRangeColumnExpr(int8(4), types.Int8)}, sql.MySQLRange{sql.LessThanRangeColumnExpr(int8(2), types.Int8)}}, ranges)
 	})
 
 	t.Run("ThreeColumnCombine", func(t *testing.T) {
 		clauses := make([]sql.MySQLRangeCollection, 3)
-		clauses[0] = sql.NewMySQLIndexBuilder(testIndex{3}).GreaterOrEqual(ctx, "column_0", 99).LessThan(ctx, "column_1", 66).Ranges(ctx)
-		clauses[1] = sql.NewMySQLIndexBuilder(testIndex{3}).GreaterOrEqual(ctx, "column_0", 1).LessOrEqual(ctx, "column_0", 47).Ranges(ctx)
-		clauses[2] = sql.NewMySQLIndexBuilder(testIndex{3}).NotEquals(ctx, "column_0", 2).LessThan(ctx, "column_1", 30).Ranges(ctx)
+		clauses[0] = sql.NewMySQLIndexBuilder(testIndex{3}).GreaterOrEqual(ctx, "column_0", nil, 99).LessThan(ctx, "column_1", nil, 66).Ranges(ctx)
+		clauses[1] = sql.NewMySQLIndexBuilder(testIndex{3}).GreaterOrEqual(ctx, "column_0", nil, 1).LessOrEqual(ctx, "column_0", nil, 47).Ranges(ctx)
+		clauses[2] = sql.NewMySQLIndexBuilder(testIndex{3}).NotEquals(ctx, "column_0", nil, 2).LessThan(ctx, "column_1", nil, 30).Ranges(ctx)
 		assert.Len(t, clauses[0], 1)
 		assert.Len(t, clauses[1], 1)
 		assert.Len(t, clauses[2], 2)