bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-07 02:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix issue 1915 and repeated link instance key for package gdb (#2250)

Browse Source 
* fix issue #1915

* fix issue in repeated link instance key

* add configuration item Namespace for package gdb

* up

* up

* fix: pgsql list table names (#2255)

Co-authored-by: Gin <qinyuguang@gmail.com>
This commit is contained in:
John Guo
2022-11-03 20:22:36 +08:00
committed by GitHub
parent ab79134309
commit c4a5b8ca94
8 changed files with 97 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
contrib/drivers/pgsql/pgsql.go
View File

@ -35,6 +35,7 @@ type Driver struct {
const (
internalPrimaryKeyInCtx gctx.StrKey = "primary_key"
defaultSchema = "public"
)
func init() {
@ -222,9 +223,18 @@ func (d *Driver) DoFilter(ctx context.Context, link gdb.Link, sql string, args [
// It's mainly used in cli tool chain for automatically generating the models.
func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string, err error) {
var (
result gdb.Result
querySchema = gutil.GetOrDefaultStr("public", schema...)
query = fmt.Sprintf(`
result gdb.Result
usedSchema = gutil.GetOrDefaultStr(d.GetConfig().Namespace, schema...)
)
if usedSchema == "" {
usedSchema = defaultSchema
}
// DO NOT use `usedSchema` as parameter for function `SlaveLink`.
link, err := d.SlaveLink(schema...)
if err != nil {
return nil, err
}
var query = fmt.Sprintf(`
SELECT
c.relname
FROM
@ -235,16 +245,11 @@ WHERE
n.nspname = '%s'
AND c.relkind IN ('r', 'p')
AND c.relpartbound IS NULL
AND PG_TABLE_IS_VISIBLE(c.oid)
ORDER BY
c.relname`,
querySchema,
)
usedSchema,
)
link, err := d.SlaveLink(schema...)
if err != nil {
return nil, err
}
query, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(query))
result, err = d.DoSelect(ctx, link, query)
if err != nil {