Skip to content

[fix] Avoid create schema #362

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
muir merged 4 commits into from
May 6, 2026
Merged

[fix] Avoid create schema #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d06fbe
[fix] avoid create schema when the schema already exists - postgres
muir May 5, 2026
51f90ed
avoid create database when it already exists - mysql & singlestore
muir May 5, 2026
0aebed8
copilot feedback
muir May 5, 2026
6807496
add tests
muir May 6, 2026
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
18 changes: 14 additions & 4 deletions lsmysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,21 @@ func (p *MySQL) CreateSchemaTableIfNotExists(ctx context.Context, _ *internal.Lo
return err
}
if schema != "" {
_, err := d.DB().ExecContext(ctx, fmt.Sprintf(`
CREATE SCHEMA IF NOT EXISTS %s
`, schema))
var schemaExists bool
err = d.DB().QueryRowContext(ctx,
`SELECT EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = ?)`,
schema,
).Scan(&schemaExists)
if err != nil {
return errors.Wrapf(err, "could not create libschema schema '%s'", schema)
return errors.Wrapf(err, "could not check if libschema schema '%s' exists", schema)
}
if !schemaExists {
_, err := d.DB().ExecContext(ctx, fmt.Sprintf(`
CREATE SCHEMA IF NOT EXISTS %s
`, schema))
if err != nil {
return errors.Wrapf(err, "could not create libschema schema '%s'", schema)
}
}
Comment thread
muir marked this conversation as resolved.
}
_, err = d.DB().ExecContext(ctx, fmt.Sprintf(`
Expand Down
3 changes: 3 additions & 0 deletions lsmysql/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ func testMysqlHappyPath(t *testing.T, dsn string, createPostfix string, driverNe
}()
defer cleanup(db)

_, err = db.Exec("CREATE SCHEMA " + options.SchemaOverride)
require.NoError(t, err)

s := libschema.New(context.Background(), options)
dbase, _, err := driverNew(t, "test", s, db)
require.NoError(t, err, "libschema NewDatabase")
Expand Down
41 changes: 26 additions & 15 deletions lspostgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,25 +330,35 @@ func (p *Postgres) DoOneMigration(ctx context.Context, log *internal.Log, d *lib
// CreateSchemaTableIfNotExists creates the migration tracking table for libschema.
// It is expected to be called by libschema.
func (p *Postgres) CreateSchemaTableIfNotExists(ctx context.Context, _ *internal.Log, d *libschema.Database) error {
schema, tableName, err := trackingSchemaTable(d)
schemaName, schema, tableName, err := trackingSchemaTable(d)
if err != nil {
return err
}
for {
if schema != "" {
_, err := d.DB().ExecContext(ctx, fmt.Sprintf(`
CREATE SCHEMA IF NOT EXISTS %s
`, schema))
if err != nil {
if schemaName != "" {
var schemaExists bool
err = d.DB().QueryRowContext(ctx,
`SELECT EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = $1)`,
schemaName,
).Scan(&schemaExists)
if err != nil {
return errors.Wrapf(err, "could not check if libschema schema '%s' exists", schemaName)
}
if !schemaExists {
for {
_, err := d.DB().ExecContext(ctx, fmt.Sprintf(`
CREATE SCHEMA IF NOT EXISTS %s
`, schema))
if err == nil {
break
}
if strings.Contains(err.Error(), `pq: duplicate key value violates unique constraint "pg_namespace_nspname_index"`) {
p.log.Warn("Ignoring create schema collision with another transaction and trying again")
time.Sleep(time.Second)
continue
}
return errors.Wrapf(err, "could not create libschema schema '%s'", schema)
return errors.Wrapf(err, "could not create libschema schema '%s'", schemaName)
}
}
Comment thread
muir marked this conversation as resolved.
break
}
for {
_, err = d.DB().ExecContext(ctx, fmt.Sprintf(`
Expand All @@ -374,25 +384,26 @@ func (p *Postgres) CreateSchemaTableIfNotExists(ctx context.Context, _ *internal
return nil
}

func trackingSchemaTable(d *libschema.Database) (string, string, error) {
func trackingSchemaTable(d *libschema.Database) (schemaName string, quotedSchema string, quotedTable string, err error) {
tableName := d.Options.TrackingTable
s := strings.Split(tableName, ".")
switch len(s) {
case 2:
schema := pq.QuoteIdentifier(s[0])
schemaName = s[0]
quotedSchema = pq.QuoteIdentifier(schemaName)
table := pq.QuoteIdentifier(s[1])
return schema, schema + "." + table, nil
return schemaName, quotedSchema, quotedSchema + "." + table, nil
case 1:
return "", pq.QuoteIdentifier(tableName), nil
return "", "", pq.QuoteIdentifier(tableName), nil
default:
return "", "", errors.Errorf("tracking table '%s' is not valid", tableName)
return "", "", "", errors.Errorf("tracking table '%s' is not valid", tableName)
}
}

// trackingTable returns the schema+table reference for the migration tracking table.
// The name is already quoted properly for use as a save postgres identifier.
func trackingTable(d *libschema.Database) string {
_, table, _ := trackingSchemaTable(d)
_, _, table, _ := trackingSchemaTable(d)
return table
}

Expand Down
2 changes: 2 additions & 0 deletions lspostgres/schema_override_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ func TestSchemaOverrideTransactional(t *testing.T) {
t.Cleanup(func() { cleanup(db) })

ctx := context.Background()
_, err = db.Exec("CREATE SCHEMA " + opts.SchemaOverride)
require.NoError(t, err)
s := libschema.New(ctx, opts)
log := libschema.LogFromLog(t)
dbase, err := lspostgres.New(log, "schema_override_tx", s, db)
Expand Down
3 changes: 3 additions & 0 deletions lssinglestore/repeat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ func TestRepeat(t *testing.T) {
defer func() { cleanup(db) }()
options.DebugLogging = true

_, err = db.Exec("CREATE DATABASE IF NOT EXISTS " + options.SchemaOverride + " PARTITIONS 2")
require.NoError(t, err)

s := libschema.New(context.Background(), options)
log := libschema.LogFromLog(t)
dbase, _, err := lssinglestore.New(log, "test", s, db)
Expand Down
35 changes: 29 additions & 6 deletions lssinglestore/singlestore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,28 @@ func makeID(raw string) (string, error) {
}
}

func normalizeSchemaName(raw string) string {
if len(raw) >= 2 && strings.HasPrefix(raw, "`") && strings.HasSuffix(raw, "`") {
return raw[1 : len(raw)-1]
}
return raw
}
Comment thread
muir marked this conversation as resolved.

func trackingSchemaTable(d *libschema.Database) (string, string, string, error) {
tableName := d.Options.TrackingTable
s := strings.Split(tableName, ".")
switch len(s) {
case 2:
schema, err := makeID(s[0])
schema := s[0]
quotedSchema, err := makeID(schema)
if err != nil {
return "", "", "", errors.Wrap(err, "cannot make tracking table schema name")
}
table, err := makeID(s[1])
if err != nil {
return "", "", "", errors.Wrap(err, "cannot make tracking table table name")
}
return schema, schema + "." + table, table, nil
return schema, quotedSchema + "." + table, table, nil
case 1:
table, err := makeID(tableName)
if err != nil {
Expand All @@ -238,11 +246,26 @@ func (p *SingleStore) CreateSchemaTableIfNotExists(ctx context.Context, _ *inter
return err
}
if schema != "" {
_, err := d.DB().ExecContext(ctx, fmt.Sprintf(`
CREATE DATABASE IF NOT EXISTS %s PARTITIONS 2
`, schema))
schemaName := normalizeSchemaName(schema)
var schemaExists bool
err = d.DB().QueryRowContext(ctx,
`SELECT EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = ?)`,
schemaName,
).Scan(&schemaExists)
Comment thread
muir marked this conversation as resolved.
if err != nil {
return errors.Wrapf(err, "could not create libschema schema '%s'", schema)
return errors.Wrapf(err, "could not check if libschema schema '%s' exists", schemaName)
}
if !schemaExists {
quotedSchema, err := makeID(schema)
if err != nil {
return errors.Wrap(err, "cannot make tracking table schema name")
}
_, err = d.DB().ExecContext(ctx, fmt.Sprintf(`
CREATE DATABASE IF NOT EXISTS %s PARTITIONS 2
`, quotedSchema))
if err != nil {
Comment thread
muir marked this conversation as resolved.
return errors.Wrapf(err, "could not create libschema schema '%s'", schemaName)
}
}
}
_, err = d.DB().ExecContext(ctx, fmt.Sprintf(`
Expand Down
Loading