Skip to content

materialize-{postgres,cratedb.redshift}: always 2-part resource path #4059

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

Draft
mdibaiee wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

materialize-{postgres,cratedb.redshift}: always 2-part resource path #4059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions materialize-cratedb/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,7 @@ func (c tableConfig) WithDefaults(cfg config) tableConfig {
}

func (c tableConfig) Parameters() ([]string, bool, error) {
var path []string
if c.Schema != "" {
path = []string{c.Schema, normalizeColumn(c.Table)}
} else {
path = []string{normalizeColumn(c.Table)}
}
return path, c.Delta, nil
return []string{c.Schema, normalizeColumn(c.Table)}, c.Delta, nil
}

func newPostgresDriver() *sql.Driver[config, tableConfig] {
Expand Down
22 changes: 8 additions & 14 deletions materialize-postgres/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,7 @@ func (r tableConfig) Validate() error {
}

func (c tableConfig) Parameters() ([]string, bool, error) {
var path []string
if c.Schema != "" {
path = []string{c.Schema, c.Table}
} else {
path = []string{c.Table}
}
return path, c.Delta, nil
return []string{c.Schema, c.Table}, c.Delta, nil
}

func newPostgresDriver() *sql.Driver[config, tableConfig] {
Expand Down Expand Up @@ -426,13 +420,13 @@ func newTransactor(
}

type binding struct {
target sql.Table
nullFieldsToStrip []string
loadInsertSQL string
storeUpdateSQL string
storeInsertSQL string
deleteQuerySQL string
loadQuerySQL string
target sql.Table
nullFieldsToStrip []string
loadInsertSQL string
storeUpdateSQL string
storeInsertSQL string
deleteQuerySQL string
loadQuerySQL string
}

func (t *transactor) addBinding(ctx context.Context, target sql.Table, is *boilerplate.InfoSchema) error {
Expand Down
8 changes: 1 addition & 7 deletions materialize-redshift/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,7 @@ func (r tableConfig) Validate() error {
}

func (c tableConfig) Parameters() ([]string, bool, error) {
var path []string
if c.Schema != "" {
path = []string{c.Schema, c.Table}
} else {
path = []string{c.Table}
}
return path, c.Delta, nil
return []string{c.Schema, c.Table}, c.Delta, nil
}

func newRedshiftDriver() *sql.Driver[config, tableConfig] {
Expand Down
Loading