truncate datetime strings, add tests

Author: angelamayxie

enginetest/enginetests.go

@@ -61,10 +61,8 @@ func TestQueries(t *testing.T, harness Harness) {
 	ctx := NewContext(harness)
 	for _, tt := range queries.QueryTests {
 		t.Run(tt.Query, func(t *testing.T) {
-			if sh, ok := harness.(SkippingHarness); ok {
-				if sh.SkipQueryTest(tt.Query) {
-					t.Skipf("Skipping query plan for %s", tt.Query)
-				}
+			if sh, ok := harness.(SkippingHarness); tt.Skip || (ok && sh.SkipQueryTest(tt.Query)) {
+				t.Skipf("Skipping query test for %s", tt.Query)
 			}
 			if IsServerEngine(e) && tt.SkipServerEngine {
 				t.Skip("skipping for server engine")
@@ -222,7 +220,7 @@ func TestQueriesPrepared(t *testing.T, harness Harness) {
 	defer e.Close()
 	t.Run("query prepared tests", func(t *testing.T) {
 		for _, tt := range queries.QueryTests {
-			if tt.SkipPrepared {
+			if tt.Skip || tt.SkipPrepared {
 				continue
 			}
 			t.Run(tt.Query, func(t *testing.T) {
@@ -233,7 +231,7 @@ func TestQueriesPrepared(t *testing.T, harness Harness) {
 
 	t.Run("function query prepared tests", func(t *testing.T) {
 		for _, tt := range queries.FunctionQueryTests {
-			if tt.SkipPrepared {
+			if tt.Skip || tt.SkipPrepared {
 				continue
 			}
 			t.Run(tt.Query, func(t *testing.T) {
@@ -265,7 +263,7 @@ func TestQueriesPrepared(t *testing.T, harness Harness) {
 func TestJoinQueriesPrepared(t *testing.T, harness Harness) {
 	harness.Setup(setup.MydbData, setup.MytableData, setup.Pk_tablesData, setup.OthertableData, setup.NiltableData, setup.XyData, setup.FooData, setup.Comp_index_tablesData)
 	for _, tt := range queries.JoinQueryTests {
-		if tt.SkipPrepared {
+		if tt.Skip || tt.SkipPrepared {
 			continue
 		}
 		TestPreparedQuery(t, harness, tt.Query, tt.Expected, tt.ExpectedColumns)

enginetest/evaluation.go

@@ -400,10 +400,9 @@ func TestQuery2(t *testing.T, harness Harness, e QueryEngine, q string, expected
 // TODO: collapse into TestQuery
 func TestQueryWithEngine(t *testing.T, harness Harness, e QueryEngine, tt queries.QueryTest) {
 	t.Run(tt.Query, func(t *testing.T) {
-		if sh, ok := harness.(SkippingHarness); ok {
-			if sh.SkipQueryTest(tt.Query) {
-				t.Skipf("Skipping query %s", tt.Query)
-			}
+		if sh, ok := harness.(SkippingHarness); tt.Skip || (IsServerEngine(e) && tt.SkipServerEngine) ||
+			(ok && sh.SkipQueryTest(tt.Query)) {
+			t.Skipf("Skipping query %s", tt.Query)
 		}
 
 		ctx := NewContext(harness)
@@ -413,9 +412,6 @@ func TestQueryWithEngine(t *testing.T, harness Harness, e QueryEngine, tt querie
 		} else if tt.ExpectedErrStr != "" {
 			AssertErrWithCtx(t, e, harness, ctx, tt.Query, tt.Bindings, nil, tt.ExpectedErrStr)
 		} else if tt.ExpectedWarning != 0 {
-			if IsServerEngine(e) && tt.SkipServerEngine {
-				t.Skip()
-			}
 			AssertWarningAndTestQuery(t, e, ctx, harness,
 				tt.Query,
 				tt.Expected,

enginetest/queries/insert_queries.go

@@ -2707,6 +2707,14 @@ var InsertErrorScripts = []ScriptTest{
 		Query:       "insert into bad values (repeat('0', 65536))",
 		ExpectedErr: types.ErrLengthBeyondLimit,
 	},
+	{
+		Name: "try inserting incorrect datetime value",
+		SetUpScript: []string{
+			"create table t (d datetime)",
+		},
+		Query:       "insert into t values ('2020-01-01 a')",
+		ExpectedErr: sql.ErrInvalidValue,
+	},
 }
 
 var InsertIgnoreScripts = []ScriptTest{

enginetest/queries/queries.go

@@ -50,6 +50,7 @@ type QueryTest struct {
 	// such as the use of the SIGNAL statement.
 	ExpectedErrStr string
 	// ExpectedWarning contains the expected warning code when a query generates warnings but not errors.
+	// The ExpectedWarningsCount field must be set as well.
 	ExpectedWarning int
 	// ExpectedWarningsCount is used to test the expected number of warnings generated by a query.
 	// The ExpectedWarning field must be set for warning counts to be checked.
@@ -62,6 +63,8 @@ type QueryTest struct {
 	ExpectedColumns sql.Schema
 	// Bindings are the bind values for the query, if provided
 	Bindings map[string]sqlparser.Expr
+	// Skip indicates that the query should be skipped
+	Skip bool
 	// SkipPrepared indicates that the query should be skipped when testing prepared statements
 	SkipPrepared bool
 	// SkipServerEngine indicates that the query should be skipped when testing a server engine (as opposed to the
@@ -4175,9 +4178,19 @@ SELECT * FROM cte WHERE  d = 2;`,
 		Expected: []sql.Row{{"9999-12-31 23:59:59.999999"}},
 	},
 	{
+		// This returns nil in MySQL but we are able to truncate the string and convert to a datetime
+		Skip:     true,
 		Query:    "SELECT date_add('9999-12-31:23:59:59.99999944444444444-', INTERVAL 0 day);",
 		Expected: []sql.Row{{nil}},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/9917
+		Query:                 "select cast('2020-01-01 a' as datetime)",
+		ExpectedWarning:       1292,
+		ExpectedWarningsCount: 1,
+		Expected:              []sql.Row{{"2020-01-01 00:00:00"}},
+	},
+	{},
 	{
 		Query: `SELECT * FROM (SELECT * FROM (SELECT * FROM (SELECT * FROM othertable) othertable_one) othertable_two) othertable_three WHERE s2 = 'first'`,
 		Expected: []sql.Row{

sql/types/datetime.go

@@ -365,10 +365,14 @@ func (t datetimeType) ConvertWithoutRangeCheck(ctx context.Context, v interface{
 }
 
 func parseDatetime(value string) (time.Time, bool) {
-	for _, layout := range TimestampDatetimeLayouts {
-		if t, err := time.Parse(layout, value); err == nil {
-			return t.UTC(), true
+	end := len(value)
+	for end > 0 {
+		for _, layout := range TimestampDatetimeLayouts {
+			if t, err := time.Parse(layout, value[0:end]); err == nil {
+				return t.UTC(), true
+			}
 		}
+		end--
 	}
 	return time.Time{}, false
 }