Skip to content

Commit 413ed89

Browse files
fix: Fix bug
1 parent a21a470 commit 413ed89

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

internal/database/cache.go

+8
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ func (u *DBCacheGenerator) GenerateDBCachePrimary(ctx context.Context) (*DBCache
2727
if err != nil {
2828
return nil, err
2929
}
30+
if dbCache.defaultSchema == "" {
31+
var topKey string
32+
for k, _ := range dbCache.Schemas {
33+
topKey = k
34+
continue
35+
}
36+
dbCache.defaultSchema = dbCache.Schemas[topKey]
37+
}
3038
dbCache.SchemaTables, err = u.repo.SchemaTables(ctx)
3139
if err != nil {
3240
return nil, err

internal/database/postgresql.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,14 @@ func (db *PostgreSQLDBRepository) Databases(ctx context.Context) ([]string, erro
127127

128128
func (db *PostgreSQLDBRepository) CurrentSchema(ctx context.Context) (string, error) {
129129
row := db.Conn.QueryRowContext(ctx, "SELECT current_schema()")
130-
var database string
130+
var database sql.NullString
131131
if err := row.Scan(&database); err != nil {
132132
return "", err
133133
}
134-
return database, nil
134+
if database.Valid {
135+
return database.String, nil
136+
}
137+
return "", nil
135138
}
136139

137140
func (db *PostgreSQLDBRepository) Schemas(ctx context.Context) ([]string, error) {

0 commit comments

Comments
 (0)