sql: udf logic tests not to skip dropping databases

Now that we support drop functions in legacy schema changer
and declarative schema changer falls back to legacy when seeing
any function descriptor, we can move udf logic tests back
to normal configs.

Release note: None.
Release justification: test only change.

pkg/BUILD.bazel

@@ -359,7 +359,6 @@ ALL_TESTS = [
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
     "//pkg/sql/logictest/tests/local-mixed-21.2-22.1:local-mixed-21_2-22_1_test",
     "//pkg/sql/logictest/tests/local-mixed-22.1-22.2:local-mixed-22_1-22_2_test",
-    "//pkg/sql/logictest/tests/local-udf:local-udf_test",
     "//pkg/sql/logictest/tests/local-v1.1-at-v1.0-noupgrade:local-v1_1-at-v1_0-noupgrade_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
@@ -376,7 +375,6 @@ ALL_TESTS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist-disk:fakedist-disk_test",
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:fakedist-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
-    "//pkg/sql/opt/exec/execbuilder/tests/local-udf:local-udf_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder_test",
@@ -1450,7 +1448,6 @@ GO_TARGETS = [
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
     "//pkg/sql/logictest/tests/local-mixed-21.2-22.1:local-mixed-21_2-22_1_test",
     "//pkg/sql/logictest/tests/local-mixed-22.1-22.2:local-mixed-22_1-22_2_test",
-    "//pkg/sql/logictest/tests/local-udf:local-udf_test",
     "//pkg/sql/logictest/tests/local-v1.1-at-v1.0-noupgrade:local-v1_1-at-v1_0-noupgrade_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
@@ -1476,7 +1473,6 @@ GO_TARGETS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist-disk:fakedist-disk_test",
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:fakedist-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
-    "//pkg/sql/opt/exec/execbuilder/tests/local-udf:local-udf_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder",
@@ -2565,7 +2561,6 @@ GET_X_DATA_TARGETS = [
     "//pkg/sql/logictest/tests/local:get_x_data",
     "//pkg/sql/logictest/tests/local-mixed-21.2-22.1:get_x_data",
     "//pkg/sql/logictest/tests/local-mixed-22.1-22.2:get_x_data",
-    "//pkg/sql/logictest/tests/local-udf:get_x_data",
     "//pkg/sql/logictest/tests/local-v1.1-at-v1.0-noupgrade:get_x_data",
     "//pkg/sql/logictest/tests/local-vec-off:get_x_data",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:get_x_data",
@@ -2586,7 +2581,6 @@ GET_X_DATA_TARGETS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist-disk:get_x_data",
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:get_x_data",
     "//pkg/sql/opt/exec/execbuilder/tests/local:get_x_data",
-    "//pkg/sql/opt/exec/execbuilder/tests/local-udf:get_x_data",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:get_x_data",
     "//pkg/sql/opt/exec/explain:get_x_data",
     "//pkg/sql/opt/idxconstraint:get_x_data",

pkg/sql/distsql_physical_planner.go

@@ -270,6 +270,10 @@ func (v *distSQLExprCheckVisitor) VisitPre(expr tree.Expr) (recurse bool, newExp
 			v.err = newQueryNotSupportedErrorf("function %s cannot be executed with distsql", t)
 			return false, expr
 		}
+	case *tree.RoutineExpr:
+		// TODO(86310): enable UDFs in DistSQL.
+		v.err = newQueryNotSupportedErrorf("user-defined routine %s cannot be executed with distsql", t)
+		return false, expr
 	case *tree.DOid:
 		v.err = newQueryNotSupportedError("OID expressions are not supported by distsql")
 		return false, expr

pkg/sql/logictest/logic.go

@@ -3644,9 +3644,6 @@ SELECT encode(descriptor, 'hex') AS descriptor
 }
 
 func (t *logicTest) maybeDropDatabases() error {
-	if t.cfg.SkipDropDatabases {
-		return nil
-	}
 	var dbNames pq.StringArray
 	if err := t.db.QueryRow(
 		`SELECT array_agg(database_name) FROM [SHOW DATABASES] WHERE database_name NOT IN ('system', 'postgres')`,

pkg/sql/logictest/logictestbase/logictestbase.go

@@ -82,12 +82,6 @@ type TestClusterConfig struct {
 	// disableLocalityOptimizedSearch disables the cluster setting
 	// locality_optimized_partitioned_index_scan, which is enabled by default.
 	DisableLocalityOptimizedSearch bool
-	// SkipDropDatabases allows a configuration to skip dropping of the database.
-	// This exists to enable development while DROP DATABASE for a feature is
-	// broken.
-	//
-	// TODO(ajwerner,chengxiong-ruan): Remove this before 22.2 is released.
-	SkipDropDatabases bool
 	// DeclarativeCorpusCollection enables support for collecting corpuses
 	// for the declarative schema changer.
 	DeclarativeCorpusCollection bool
@@ -468,16 +462,6 @@ var LogicTestConfigs = []TestClusterConfig{
 		DisableUpgrade:              true,
 		DeclarativeCorpusCollection: true,
 	},
-	{
-		Name:     "local-udf",
-		NumNodes: 1,
-		// local is the configuration where we run all tests which have bad
-		// interactions with the default test tenant.
-		DisableDefaultTestTenant: true,
-		// Set SkipDropDatabases to true for now to enable development on UDFs.
-		// TODO(ajwerner,chengxiong-ruan): Remove this before the 22.2 release.
-		SkipDropDatabases: true,
-	},
 }
 
 // ConfigIdx is an index in the above slice.

pkg/sql/logictest/testdata/logic_test/udf

@@ -1,5 +1,3 @@
-# LogicTest: local-udf
-
 statement ok
 CREATE TABLE ab (
 a INT PRIMARY KEY,
@@ -1222,8 +1220,9 @@ query TT
                         $test_alter_sc_f_test_sc
                     )
            )
-SELECT fn->'id', fn->'parentSchemaId'
-  FROM fns;
+SELECT fn->>'id' AS id, fn->'parentSchemaId'
+  FROM fns
+  ORDER BY id;
 ----
 170  105
 171  105
@@ -1254,8 +1253,9 @@ query TT
                         $test_alter_sc_f_test_sc
                     )
            )
-SELECT fn->'id', fn->'parentSchemaId'
-  FROM fns;
+SELECT fn->>'id' AS id, fn->'parentSchemaId'
+  FROM fns
+  ORDER BY id;
 ----
 170  105
 171  105
@@ -1303,8 +1303,9 @@ query TT
                         $test_alter_sc_f_test_sc
                     )
            )
-SELECT fn->'id', fn->'parentSchemaId'
-  FROM fns;
+SELECT fn->>'id' AS id, fn->'parentSchemaId'
+  FROM fns
+  ORDER BY id;
 ----
 170  105
 171  172

pkg/sql/opt/exec/execbuilder/testdata/udf

@@ -1,4 +1,4 @@
-# LogicTest: local-udf
+# LogicTest: local
 
 statement ok
 CREATE TABLE t (