Merge pull request #640 from dolthub/jennifer/current-schema

current_schema function return non `"$user"` schema

server/functions/current_schema.go

@@ -15,7 +15,6 @@
 package functions
 
 import (
-	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/resolve"
 	"github.com/dolthub/go-mysql-server/sql"
 
 	"github.com/dolthub/doltgresql/server/functions/framework"
@@ -34,7 +33,7 @@ var current_schema = framework.Function0{
 	IsNonDeterministic: true,
 	Strict:             true,
 	Callable: func(ctx *sql.Context) (any, error) {
-		schemas, err := resolve.SearchPath(ctx)
+		schemas, err := GetCurrentSchemas(ctx)
 		if err != nil {
 			return nil, err
 		}

server/functions/current_schemas.go

@@ -15,11 +15,11 @@
 package functions
 
 import (
-	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/resolve"
+	"strings"
+
 	"github.com/dolthub/go-mysql-server/sql"
 
 	"github.com/dolthub/doltgresql/postgres/parser/sessiondata"
-
 	"github.com/dolthub/doltgresql/server/functions/framework"
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
@@ -36,12 +36,12 @@ var current_schemas = framework.Function1{
 	Parameters:         [1]pgtypes.DoltgresType{pgtypes.Bool},
 	IsNonDeterministic: true,
 	Strict:             true,
-	Callable: func(ctx *sql.Context, _ [2]pgtypes.DoltgresType, val1 any) (any, error) {
+	Callable: func(ctx *sql.Context, _ [2]pgtypes.DoltgresType, val any) (any, error) {
 		schemas := make([]any, 0)
-		if val1.(bool) {
+		if val.(bool) {
 			schemas = append(schemas, sessiondata.PgCatalogName)
 		}
-		searchPaths, err := resolve.SearchPath(ctx)
+		searchPaths, err := GetCurrentSchemas(ctx)
 		if err != nil {
 			return nil, err
 		}
@@ -51,3 +51,24 @@ var current_schemas = framework.Function1{
 		return schemas, nil
 	},
 }
+
+// GetCurrentSchemas returns all the schemas in the search_path setting, with elements like "$user" excluded
+func GetCurrentSchemas(ctx *sql.Context) ([]string, error) {
+	searchPathVar, err := ctx.GetSessionVariable(ctx, "search_path")
+	if err != nil {
+		return nil, err
+	}
+
+	pathElems := strings.Split(searchPathVar.(string), ",")
+	var path []string
+
+	for _, schemaName := range pathElems {
+		schemaName = strings.Trim(schemaName, " ")
+		if schemaName == "\"$user\"" {
+			continue
+		}
+		path = append(path, schemaName)
+	}
+
+	return path, nil
+}

testing/go/functions_test.go

@@ -420,13 +420,13 @@ func TestSystemInformationFunctions(t *testing.T) {
 					Query: `SELECT current_schema();`,
 					Cols:  []string{"\"current_schema\""},
 					Expected: []sql.Row{
-						{"postgres"},
+						{"public"},
 					},
 				},
 				{
 					Query: `SELECT current_schema();`,
 					Expected: []sql.Row{
-						{"postgres"},
+						{"public"},
 					},
 				},
 				{
@@ -444,7 +444,7 @@ func TestSystemInformationFunctions(t *testing.T) {
 					},
 				},
 				{
-					Query:    `SET SEARCH_PATH TO public;`,
+					Query:    `SET SEARCH_PATH TO public, test_schema;`,
 					Expected: []sql.Row{},
 				},
 				{
@@ -459,6 +459,16 @@ func TestSystemInformationFunctions(t *testing.T) {
 						{"public"},
 					},
 				},
+				{
+					Query:    `SET SEARCH_PATH TO test_schema, public;`,
+					Expected: []sql.Row{},
+				},
+				{
+					Query: `SELECT current_schema();`,
+					Expected: []sql.Row{
+						{"test_schema"},
+					},
+				},
 				// TODO: Implement table function for current_schema
 				{
 					Query: `SELECT * FROM current_schema();`,
@@ -483,13 +493,13 @@ func TestSystemInformationFunctions(t *testing.T) {
 					Query: `SELECT current_schemas(true);`,
 					Cols:  []string{"current_schemas"},
 					Expected: []sql.Row{
-						{"{pg_catalog,postgres,public}"},
+						{"{pg_catalog,public}"},
 					},
 				},
 				{ // TODO: Not sure why Postgres does not display "$user" here
 					Query: `SELECT current_schemas(false);`,
 					Expected: []sql.Row{
-						{"{postgres,public}"},
+						{"{public}"},
 					},
 				},
 				{