LBRYCommunity/sqlboiler
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Remove system tables from postgres driver lookups

Browse source
This commit is contained in:
Aaron L 2016-06-26 23:53:17 -07:00
parent 0e7c2561db
commit f7a4d3d34b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bdb/drivers/postgres.go
View file

@ -54,7 +54,7 @@ func (p *PostgresDriver) TableNames() ([]string, error) {
rows, err := p.dbConn.Query(` rows, err := p.dbConn.Query(`
select table_name from information_schema.tables select table_name from information_schema.tables
where table_schema='public' and table_name not like '%migrations%' where table_schema = 'public' and table_name not like '%migrations%'
`) `)
if err != nil { if err != nil {
@ -82,7 +82,8 @@ func (p *PostgresDriver) Columns(tableName string) ([]bdb.Column, error) {
rows, err := p.dbConn.Query(` rows, err := p.dbConn.Query(`
select column_name, data_type, column_default, is_nullable select column_name, data_type, column_default, is_nullable
from information_schema.columns where table_name=$1 from information_schema.columns
where table_name=$1 and table_schema = 'public'
`, tableName) `, tableName)
if err != nil { if err != nil {
@ -123,7 +124,7 @@ func (p *PostgresDriver) PrimaryKeyInfo(tableName string) (*bdb.PrimaryKey, erro
query := ` query := `
select tc.constraint_name select tc.constraint_name
from information_schema.table_constraints as tc from information_schema.table_constraints as tc
where tc.table_name = $1 and tc.constraint_type = 'PRIMARY KEY';` where tc.table_name = $1 and tc.constraint_type = 'PRIMARY KEY' and tc.table_schema = 'public';`
row := p.dbConn.QueryRow(query, tableName) row := p.dbConn.QueryRow(query, tableName)
if err = row.Scan(&pkey.Name); err != nil { if err = row.Scan(&pkey.Name); err != nil {
@ -136,7 +137,7 @@ func (p *PostgresDriver) PrimaryKeyInfo(tableName string) (*bdb.PrimaryKey, erro
queryColumns := ` queryColumns := `
select kcu.column_name select kcu.column_name
from information_schema.key_column_usage as kcu from information_schema.key_column_usage as kcu
where constraint_name = $1;` where constraint_name = $1 and table_schema = 'public';`
var rows *sql.Rows var rows *sql.Rows
if rows, err = p.dbConn.Query(queryColumns, pkey.Name); err != nil { if rows, err = p.dbConn.Query(queryColumns, pkey.Name); err != nil {
@ -178,7 +179,7 @@ func (p *PostgresDriver) ForeignKeyInfo(tableName string) ([]bdb.ForeignKey, err
from information_schema.table_constraints as tc from information_schema.table_constraints as tc
inner join information_schema.key_column_usage as kcu ON tc.constraint_name = kcu.constraint_name inner join information_schema.key_column_usage as kcu ON tc.constraint_name = kcu.constraint_name
inner join information_schema.constraint_column_usage as ccu ON tc.constraint_name = ccu.constraint_name inner join information_schema.constraint_column_usage as ccu ON tc.constraint_name = ccu.constraint_name
where tc.table_name = $1 and tc.constraint_type = 'FOREIGN KEY';` where tc.table_name = $1 and tc.constraint_type = 'FOREIGN KEY' and tc.table_schema = 'information_schema';`
var rows *sql.Rows var rows *sql.Rows
var err error var err error