8000 Restrict state connection search path by andrew-farries · Pull Request #342 · xataio/pgroll · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Restrict state connection search path #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Restrict state connection search path #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7088020
Add test for qualification of UDTs in other schema
andrew-farries Apr 12, 2024
f521a73
Restrict state search path to the state schema
andrew-farries Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkg/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,14 @@ type State struct {
}

func New(ctx context.Context, pgURL, stateSchema string) (*State, error) {
conn, err := sql.Open("postgres", pgURL)
dsn, err := pq.ParseURL(pgURL)
if err != nil {
dsn = pgURL
}

dsn += " search_path=" + stateSchema

conn, err := sql.Open("postgres", dsn)
if err != nil {
return nil, err
}
Expand Down
24 changes: 24 additions & 0 deletions pkg/state/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,30 @@ func TestReadSchema(t *testing.T) {
},
},
},
{
name: "column whose type is a UDT in another schema should have the type prefixed with the schema",
createStmt: "CREATE DOMAIN email_type AS varchar(255); CREATE TABLE public.table1 (a email_type);",
wantSchema: &schema.Schema{
Name: "public",
Tables: map[string]schema.Table{
"table1": {
Name: "table1",
Columns: map[string]schema.Column{
"a": {
Name: "a",
Type: "public.email_type",
Nullable: true,
},
},
PrimaryKey: []string{},
Indexes: map[string]schema.Index{},
ForeignKeys: map[string]schema.ForeignKey{},
CheckConstraints: map[string]schema.CheckConstraint{},
UniqueConstraints: map[string]schema.UniqueConstraint{},
},
},
},
},
}

for _, tt := range tests {
Expand Down
0