Skip to content

Postgres search_path relies on schema rather than tableowner. #15

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Postgres search_path relies on schema rather than tableowner. #15

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c4f30b
Change the table description and table complete because the object re…
Oct 2, 2015
a86548e
Fix duplicate helptag. As it is done in pull request 3 already
Nov 5, 2015
8110a61
Fix problem with 'operator does not exist: oidvector = oid' for DBDes…
Feb 9, 2016
98543a6
Merge changes from version 23.00
Feb 10, 2016
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
45 changes: 24 additions & 21 deletions autoload/dbext.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3735,26 +3735,28 @@ function! s:DB_PGSQL_describeTable(table_name)
endfunction

function! s:DB_PGSQL_describeProcedure(procedure_name)
let owner = s:DB_getObjectOwner(a:procedure_name)
let schema = s:DB_getObjectOwner(a:procedure_name)
let proc_name = s:DB_getObjectName(a:procedure_name)
let query = "SELECT p.* ".
\ " FROM pg_proc p, pg_type t, pg_language l " .
\ " WHERE p.proargtypes = t.oid " .
\ " AND p.prolang = t.oid " .
\ " AND p.proname = '" . proc_name . "'"
" let query = "SELECT t.typname, t.typdefault, t.typinput " .
" \ " , t.typoutput, l.lanname " .
" \ " FROM pg_proc p, pg_type t, pg_language l " .
" \ " WHERE p.proargtypes = t.oid " .
" \ " AND p.prolang = t.oid " .
" \ " AND p.proname = '" . proc_name . "'"

if strlen(owner) > 0
let query = "SELECT n.nspname as \"Schema\", " .
\ " p.proname as \"Name\", " .
\ " pg_catalog.pg_get_function_result(p.oid) as \"Result data type\", " .
\ " pg_catalog.pg_get_function_arguments(p.oid) as \"Argument data types\", " .
\ " CASE " .
\ " WHEN p.proisagg THEN 'agg' " .
\ " WHEN p.proiswindow THEN 'window' " .
\ " WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN 'trigger' " .
\ " ELSE 'normal' " .
\ " END as \"Type\" " .
\ " FROM pg_catalog.pg_proc p " .
\ " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace " .
\ " WHERE p.proname ~ '^(" . proc_name . ".*)$' "

if strlen(schema) > 0
let query = query .
\ " AND pg_get_userbyid(p.proowner) = '".owner."' "
\ " AND n.nspname ~ '^(" . schema .")$' "
endif
let query = query .
\ " ORDER BY p.pronargs; "
\ "ORDER BY 1, 2, 4;"
return s:DB_PGSQL_execSql( query )
endfunction

Expand Down Expand Up @@ -3797,15 +3799,16 @@ endfunction
function! s:DB_PGSQL_getListColumn(table_name)
let owner = s:DB_getObjectOwner(a:table_name)
let table_name = s:DB_getObjectName(a:table_name)
let query = "SELECT a.attname " .
\ " FROM pg_class c, pg_attribute a " .
\ " WHERE c.oid = a.attrelid " .
\ " AND a.attnum > 0 " .
let query = "SELECT a.attname " .
\ " FROM pg_class c" .
\ " JOIN pg_attribute a ON c.oid = a.attrelid " .
\ " JOIN pg_namespace n ON c.relnamespace = n.oid " .
\ " WHERE a.attnum > 0" .
\ " AND c.relname = '" . table_name . "'"

if strlen(owner) > 0
let query = query .
\ " AND pg_get_userbyid(c.relowner) = '".owner."' "
\ " AND n.nspname = '".owner."' "
endif
let query = query .
\ " ORDER BY a.attnum; "
Expand Down