Merge pull request #2753 from dolthub/daylon/auth-fixes

Fixes CTE issue with auth

Author: Hydrocharged

enginetest/enginetests.go

@@ -1809,10 +1809,6 @@ func TestUserPrivileges(t *testing.T, harness ClientHarness) {
 					}
 				}
 
-				if assertion.Skip {
-					t.Skipf("Skipping query %s", assertion.Query)
-				}
-
 				user := assertion.User
 				host := assertion.Host
 				if user == "" {

enginetest/queries/priv_auth_queries.go

@@ -43,7 +43,6 @@ type UserPrivilegeTestAssertion struct {
 	Expected       []sql.Row
 	ExpectedErr    *errors.Kind
 	ExpectedErrStr string
-	Skip           bool
 }
 
 // QuickPrivilegeTest specifically tests privileges on a predefined user (tester@localhost) using predefined tables and
@@ -68,6 +67,7 @@ type UserPrivilegeTestAssertion struct {
 // match the non-nil empty row with it, due to the aforementioned distinction.
 //
 // Statements that are run before every test (the state that all tests start with):
+// CREATE USER tester@localhost;
 // CREATE TABLE mydb.test (pk BIGINT PRIMARY KEY, v1 BIGINT);
 // CREATE TABLE mydb.test2 (pk BIGINT PRIMARY KEY, v1 BIGINT);
 // CREATE TABLE otherdb.test (pk BIGINT PRIMARY KEY, v1 BIGINT);
@@ -407,6 +407,7 @@ var UserPrivTests = []UserPrivilegeTest{
 		Name: "Basic database and table name visibility",
 		SetUpScript: []string{
 			"CREATE TABLE mydb.test (pk BIGINT PRIMARY KEY);",
+			"CREATE TABLE mydb.invis (pk BIGINT PRIMARY KEY);",
 			"INSERT INTO mydb.test VALUES (1);",
 			"CREATE USER tester@localhost;",
 			"CREATE ROLE test_role;",
@@ -516,12 +517,23 @@ var UserPrivTests = []UserPrivilegeTest{
 				Expected: []sql.Row{{1}},
 			},
 			{
-				Skip:     true, // CTEs are seen as different tables than underlying table(s).
 				User:     "tester",
 				Host:     "localhost",
 				Query:    "WITH cte AS (SELECT * FROM mydb.test) SELECT * FROM cte;/*6*/",
 				Expected: []sql.Row{{1}},
 			},
+			{
+				User:        "tester",
+				Host:        "localhost",
+				Query:       "WITH cte AS (SELECT * FROM mydb.test) SELECT * FROM cte JOIN mydb.invis t2 WHERE cte.pk = t2.pk;",
+				ExpectedErr: sql.ErrTableAccessDeniedForUser,
+			},
+			{
+				User:     "tester",
+				Host:     "localhost",
+				Query:    "WITH cte AS (SELECT * FROM mydb.test) SELECT * FROM cte JOIN mydb.test t2 WHERE cte.pk = t2.pk;",
+				Expected: []sql.Row{{1, 1}},
+			},
 			{
 				User:        "tester",
 				Host:        "localhost",

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9
+	github.com/dolthub/vitess v0.0.0-20241119005402-6a198321d993
 	github.com/go-kit/kit v0.10.0
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2

go.sum

@@ -58,8 +58,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
-github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9 h1:s36zDuLPuZRWC0nBCJs2Z8joP19eKEtcsIsuE8K9Kx0=
-github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
+github.com/dolthub/vitess v0.0.0-20241119005402-6a198321d993 h1:MhD6jHjshx2djyUq/uZxtCyHBYAnE3WshhJDUaO9fD8=
+github.com/dolthub/vitess v0.0.0-20241119005402-6a198321d993/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=

sql/planbuilder/cte.go

@@ -42,11 +42,6 @@ func (b *Builder) buildWith(inScope *scope, with *ast.With) (outScope *scope) {
 	outScope = inScope.push()
 
 	for _, cte := range with.Ctes {
-		cte, ok := cte.(*ast.CommonTableExpr)
-		if !ok {
-			b.handleErr(sql.ErrUnsupportedFeature.New(fmt.Sprintf("Unsupported type of common table expression %T", cte)))
-		}
-
 		ate := cte.AliasedTableExpr
 		sq, ok := ate.Expr.(*ast.Subquery)
 		if !ok {