Bugfix type quoting and add select generator

This commit is contained in:
Derry Hamilton 2019-07-12 13:51:30 +01:00
parent 633fbe7391
commit ddc67f3a41
2 changed files with 81 additions and 17 deletions

View file

@ -14,22 +14,22 @@ declare
pks text;
begin
SELECT
array_to_string(array_agg(quote_ident(pg_attribute.attname::text) ),', ') into pks
FROM
pg_index,
pg_class,
pg_attribute,
pg_namespace
WHERE
pg_class.relname = tabname AND
indrelid = pg_class.oid AND
nspname = sch AND
pg_class.relnamespace = pg_namespace.oid AND
pg_attribute.attrelid = pg_class.oid AND
pg_attribute.attnum = any(pg_index.indkey)
AND indisprimary ;
array_to_string(array_agg(quote_ident(pg_attribute.attname::text) ),', ') into pks
FROM
pg_index,
pg_class,
pg_attribute,
pg_namespace
WHERE
pg_class.relname = tabname
AND indrelid = pg_class.oid
AND nspname = sch
AND pg_class.relnamespace = pg_namespace.oid
AND pg_attribute.attrelid = pg_class.oid
AND pg_attribute.attnum = any(pg_index.indkey)
AND indisprimary ;
header := 'INSERT INTO '||quote_ident(sch)||'.'||quote_ident(tabname)||E' as t (\n ';
header := E'INSERT INTO '||quote_ident(sch)||'.'||quote_ident(tabname)||E' as t (\n ';
for colinfo in
select
*
@ -40,7 +40,6 @@ begin
and table_name = tabname
order by ordinal_position
loop
raise info 'Working on %.% (%)',sch,tabname,colinfo::text;
if not is_first then
col_list := col_list || E',\n ';
vals := vals || E',\n ';
@ -48,7 +47,7 @@ begin
changes := changes || E'\n OR ';
end if;
col_list := col_list || quote_ident(colinfo.column_name);
vals := vals || '?::' || quote_ident(colinfo.data_type);
vals := vals || '?::' || colinfo.data_type;
sets := sets || quote_ident(colinfo.column_name) ||
E' = EXCLUDED.' || quote_ident(colinfo.column_name);
changes := changes || E't.' || quote_ident(colinfo.column_name) ||