Merge pull request #9908 from dolthub/macneale4-claude/boolean-tests

Add expect_single_value support for booleans

go/libraries/doltcore/env/actions/test_table_helpers.go

@@ -81,6 +81,18 @@ func expectSingleValue(sqlCtx *sql.Context, comparison string, value *string, qu
 		return compareNullValue(comparison, row[0], AssertionExpectedSingleValue), nil
 	}
 
+	// Check if the expected value is a boolean string, and if so, coerce the actual value to boolean, with the exception
+	// of "0" and "1", which are valid integers and are covered below.
+	if *value != "0" && *value != "1" {
+		if expectedBool, err := strconv.ParseBool(*value); err == nil {
+			actualBool, boolErr := getInterfaceAsBool(row[0])
+			if boolErr != nil {
+				return fmt.Sprintf("Could not convert value to boolean: %v", boolErr), nil
+			}
+			return compareBooleans(comparison, expectedBool, actualBool, AssertionExpectedSingleValue), nil
+		}
+	}
+
 	switch actualValue := row[0].(type) {
 	case int8:
 		expectedInt, err := strconv.ParseInt(*value, 10, 64)
@@ -346,6 +358,59 @@ func compareDecimals(comparison string, expectedValue, realValue decimal.Decimal
 	return ""
 }
 
+// getTinyIntColAsBool returns the value interface{} as a bool
+// This is necessary because the query engine may return a tinyint column as a bool, int, or other types.
+// Based on GetTinyIntColAsBool from commands/utils.go, which we can't depend on here due to package cycles.
+func getInterfaceAsBool(col interface{}) (bool, error) {
+	switch v := col.(type) {
+	case bool:
+		return v, nil
+	case int:
+		return v == 1, nil
+	case int8:
+		return v == 1, nil
+	case int16:
+		return v == 1, nil
+	case int32:
+		return v == 1, nil
+	case int64:
+		return v == 1, nil
+	case uint:
+		return v == 1, nil
+	case uint8:
+		return v == 1, nil
+	case uint16:
+		return v == 1, nil
+	case uint32:
+		return v == 1, nil
+	case uint64:
+		return v == 1, nil
+	case string:
+		return v == "1", nil
+	default:
+		return false, fmt.Errorf("unexpected type %T, was expecting bool, int, or string", v)
+	}
+}
+
+// compareBooleans is a function used for comparing boolean values.
+// It takes in a comparison string from one of: "==", "!="
+// It returns a string. The string is empty if the assertion passed, or has a message explaining the failure otherwise
+func compareBooleans(comparison string, expectedValue, realValue bool, assertionType string) string {
+	switch comparison {
+	case "==":
+		if expectedValue != realValue {
+			return fmt.Sprintf("Assertion failed: %s equal to %t, got %t", assertionType, expectedValue, realValue)
+		}
+	case "!=":
+		if expectedValue == realValue {
+			return fmt.Sprintf("Assertion failed: %s not equal to %t, got %t", assertionType, expectedValue, realValue)
+		}
+	default:
+		return fmt.Sprintf("%s is not a valid comparison for boolean values. Only '==' and '!=' are supported", comparison)
+	}
+	return ""
+}
+
 // compareNullValue is a function used for comparing a null value.
 // It takes in a comparison string from one of: "==", "!="
 // It returns a string. The string is empty if the assertion passed, or has a message explaining the failure otherwise

go/libraries/doltcore/sqle/enginetest/dolt_queries_test_table.go

@@ -307,6 +307,24 @@ var DoltTestRunFunctionScripts = []queries.ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "Can expect single boolean",
+		SetUpScript: []string{
+			"CREATE TABLE booleans (b BOOLEAN)",
+			"INSERT INTO booleans VALUES (true)",
+			"INSERT INTO dolt_tests VALUES ('should pass', 'boolean tests', 'select * from booleans;', 'expected_single_value', '==', 'true'), " +
+				"('should fail', 'boolean tests', 'select * from booleans;', 'expected_single_value', '==', 'false')",
+		},
+		Assertions: []queries.ScriptTestAssertion{
+			{
+				Query: "SELECT * FROM dolt_test_run('boolean tests')",
+				Expected: []sql.Row{
+					{"should fail", "boolean tests", "select * from booleans;", "FAIL", "Assertion failed: expected_single_value equal to false, got true"},
+					{"should pass", "boolean tests", "select * from booleans;", "PASS", ""},
+				},
+			},
+		},
+	},
 	{
 		Name: "Can handle null values correctly",
 		SetUpScript: []string{