Merge branch 'main' into jennifer/sys-var

Author: jennifersp

enginetest/join_op_tests.go

@@ -105,6 +105,61 @@ var EngineOnlyJoinOpTests = []joinOpTest{
 }
 
 var DefaultJoinOpTests = []joinOpTest{
+	{
+		// https://github.com/dolthub/dolt/issues/9807
+		name: "FULL OUTER JOIN fails with empty subquery",
+		setup: [][]string{
+			{
+				"CREATE TABLE t(c BOOLEAN);",
+				"INSERT INTO t VALUES (FALSE);",
+			},
+		},
+		tests: []JoinOpTests{
+			{
+				Query: "SELECT * FROM ( SELECT c FROM t WHERE c ) sub1 FULL OUTER JOIN ( SELECT 1 AS c ) sub2 ON 1=1;",
+				Expected: []sql.Row{
+					{nil, 1},
+				},
+			},
+		},
+	},
+	{
+		// https://github.com/dolthub/dolt/issues/9807
+		name: "FULL OUTER JOIN with empty tables",
+		setup: [][]string{
+			{
+				"CREATE TABLE t1 (i INT);",
+				"CREATE TABLE t2 (j INT);",
+				"INSERT INTO t2 VALUES (1);",
+			},
+		},
+		tests: []JoinOpTests{
+			{
+				Query: "SELECT i, j FROM t1 FULL OUTER JOIN t2 ON 1=1;",
+				Expected: []sql.Row{
+					{nil, 1},
+				},
+			},
+			{
+				Query: "SELECT j, i FROM t2 FULL OUTER JOIN t1 ON 1=1;",
+				Expected: []sql.Row{
+					{1, nil},
+				},
+			},
+			{
+				Query: "SELECT i, j FROM t1 FULL OUTER JOIN t2 ON 1=0;",
+				Expected: []sql.Row{
+					{nil, 1},
+				},
+			},
+			{
+				Query: "SELECT j, i FROM t2 FULL OUTER JOIN t1 ON 1=0;",
+				Expected: []sql.Row{
+					{1, nil},
+				},
+			},
+		},
+	},
 	{
 		name: "bug where transitive join edge drops filters",
 		setup: [][]string{

enginetest/join_planning_tests.go

@@ -1788,6 +1788,34 @@ join uv d on d.u = c.x`,
 			},
 		},
 	},
+	{
+		name: "single look up plan does not drop complex equality filters",
+		setup: []string{
+			"create table t1 (i int primary key);",
+			"create table t2 (j int);",
+			"create table t3 (k int);",
+			"insert into t1 values (1), (2);",
+			"insert into t2 values (1), (2);",
+			"insert into t3 values (3);",
+		},
+		tests: []JoinPlanTest{
+			{
+				q:     "select * from t1 cross join t2 join (select * from t3) v3 on v3.k = t2.j;",
+				types: []plan.JoinType{plan.JoinTypeHash, plan.JoinTypeCross},
+				exp:   []sql.Row{},
+			},
+			{
+				q:     "select * from t1 cross join t2 join (select * from t3) v3 on v3.k >= t2.j order by i, j, k;",
+				types: []plan.JoinType{plan.JoinTypeInner, plan.JoinTypeCross},
+				exp: []sql.Row{
+					{1, 1, 3},
+					{1, 2, 3},
+					{2, 1, 3},
+					{2, 2, 3},
+				},
+			},
+		},
+	},
 }
 
 func TestJoinPlanning(t *testing.T, harness Harness) {

enginetest/queries/function_queries.go

@@ -569,9 +569,26 @@ var FunctionQueryTests = []QueryTest{
 	{
 		Query: "SELECT BIT_LENGTH(i) from mytable order by i limit 1",
 		Expected: []sql.Row{
-			{64},
+			{8},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/9818
+		Query:    "select bit_length(10)",
+		Expected: []sql.Row{{16}},
+	},
+	{
+		Query:    "select bit_length(now())",
+		Expected: []sql.Row{{152}},
+	},
+	{
+		Query:    "select bit_length(-10)",
+		Expected: []sql.Row{{24}},
+	},
+	{
+		Query:    "select bit_length(true)",
+		Expected: []sql.Row{{8}},
+	},
 	{
 		Query: "select date_format(datetime_col, '%D') from datetime_table order by 1",
 		Expected: []sql.Row{

enginetest/queries/integration_plans.go

@@ -1200,6 +1200,37 @@ var JoinScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "HashLookup with type int8 and string type conversions",
+		SetUpScript: []string{
+			"create table t1 (c1 boolean);",
+			"create table t2 (c2 varchar(500));",
+			"insert into t1 values (true), (false);",
+			"insert into t2 values ('abc'), ('def');", // will be converted to float64(0) and match false
+			"insert into t2 values ('1asdf');",        // will be converted to '1' and match true
+			"insert into t2 values ('5five');",        // will be converted to '5' and match nothing
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				// TODO: our warnings don't align with MySQL
+				Query: "select /*+ HASH_JOIN(t1, t2) */ * from t1 join t2 where c1 = c2 order by c1, c2;",
+				Expected: []sql.Row{
+					{0, "abc"},
+					{0, "def"},
+					{1, "1asdf"},
+				},
+			},
+			{
+				// TODO: our warnings don't align with MySQL
+				Query: "select /*+ INNER_JOIN(t1, t2) */ * from t1 join t2 where c1 = c2 order by c1, c2;",
+				Expected: []sql.Row{
+					{0, "abc"},
+					{0, "def"},
+					{1, "1asdf"},
+				},
+			},
+		},
+	},
 }
 
 var LateralJoinScriptTests = []ScriptTest{
@@ -1398,4 +1429,20 @@ LATERAL (
 			},
 		},
 	},
+	{
+		// https://github.com/dolthub/dolt/issues/9820
+		Name: "lateral cross join with subquery",
+		SetUpScript: []string{
+			"create table t0(c0 boolean)",
+			"create table t1(c0 int)",
+			"insert into t0 values (true)",
+			"insert into t1 values(0)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "select v.c0, t1.c0 from t0 cross join lateral (select 1 as c0) as v join t1 on v.c0 > t1.c0",
+				Expected: []sql.Row{{1, 0}},
+			},
+		},
+	},
 }

enginetest/queries/join_queries.go

@@ -892,6 +892,26 @@ var QueryTests = []QueryTest{
 		Query:    "SELECT 1 % true",
 		Expected: []sql.Row{{"0"}},
 	},
+	{
+		Query:    "select 'abc' = false",
+		Expected: []sql.Row{{true}},
+	},
+	{
+		Query:    "select '123abc' = 123",
+		Expected: []sql.Row{{true}},
+	},
+	{
+		Query:    "select '1abc' = true",
+		Expected: []sql.Row{{true}},
+	},
+	{
+		Query:    "select '123abc' = false",
+		Expected: []sql.Row{{false}},
+	},
+	{
+		Query:    "select '123abc' = true",
+		Expected: []sql.Row{{false}},
+	},
 	{
 		Query:    "SELECT * from mytable where (0.000 and true)",
 		Expected: []sql.Row{},