cartodb/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cases of double-quoting identifiers

Browse Source
This commit is contained in:
Javier Goizueta 2019-07-04 12:47:58 +02:00
parent cb353ec6a8
commit dbd403a2f6
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts-available/CDB_SyncTable.sql
View File

@ -71,29 +71,17 @@ $$ LANGUAGE sql VOLATILE PARALLEL UNSAFE;
/* /*
Given a table name and an array of column names, Given a table name and an array of column names,
return array of column names qualified with the table name and quoted when necessary return array of column names qualified with the table name and quoted when necessary
tablename and colnames should be properly quoted, and for this reason the type NAME is not
used for them (with quotes they could exceed the maximum identifier length)
Example of usage: Example of usage:
SELECT @extschema@.__CDB_QualifyColumns('t', ARRAY['a','b-1']); --> ARRAY['t.a','t."b-1"'] SELECT @extschema@.__CDB_QualifyColumns('t', ARRAY['a','"b-1"']); --> ARRAY['t.a','t."b-1"']
*/ */
CREATE OR REPLACE FUNCTION @extschema@.__CDB_QualifyColumns(tablename NAME, colnames NAME[]) RETURNS TEXT[] AS CREATE OR REPLACE FUNCTION @extschema@.__CDB_QualifyColumns(tablename NAME, colnames NAME[]) RETURNS TEXT[] AS
$$ $$
SELECT array_agg(quote_ident(tablename) || '.' || quote_ident(_colname)) from unnest(colnames) _colname; SELECT array_agg(tablename || '.' || _colname) from unnest(colnames) _colname;
$$ LANGUAGE sql IMMUTABLE PARALLEL SAFE;
/*
Given an array of column names,
return array of column names quoted when necessary
Example of usage:
SELECT @extschema@.__CDB_QuoteColumns(ARRAY['a','b-1']); --> ARRAY['a','"b-1"']
*/
CREATE OR REPLACE FUNCTION @extschema@.__CDB_QuoteColumns(colnames NAME[]) RETURNS TEXT[] AS
$$
SELECT array_agg(quote_ident(_colname)) from unnest(colnames) _colname;
$$ LANGUAGE sql IMMUTABLE PARALLEL SAFE; $$ LANGUAGE sql IMMUTABLE PARALLEL SAFE;
/* /*
@ -128,7 +116,7 @@ DECLARE
BEGIN BEGIN
-- If the destination table does not exist, just copy the source table -- If the destination table does not exist, just copy the source table
fq_dest_table := format('%s.%I', dst_schema, dst_table); fq_dest_table := format('%s.%I', dst_schema, dst_table);
EXECUTE format('CREATE TABLE IF NOT EXISTS %s as TABLE %I', fq_dest_table, src_table); EXECUTE format('CREATE TABLE IF NOT EXISTS %s as TABLE %s', fq_dest_table, src_table);
GET DIAGNOSTICS num_rows = ROW_COUNT; GET DIAGNOSTICS num_rows = ROW_COUNT;
IF num_rows > 0 THEN IF num_rows > 0 THEN
RAISE NOTICE 'INSERTED % row(s)', num_rows; RAISE NOTICE 'INSERTED % row(s)', num_rows;
@ -143,7 +131,7 @@ BEGIN
-- Deal with deleted rows: ids in dest but not in source -- Deal with deleted rows: ids in dest but not in source
t := clock_timestamp(); t := clock_timestamp();
EXECUTE format( EXECUTE format(
'DELETE FROM %1$s _dst WHERE NOT EXISTS (SELECT * FROM %2$I _src WHERE _src.cartodb_id=_dst.cartodb_id)', 'DELETE FROM %1$s _dst WHERE NOT EXISTS (SELECT * FROM %2$s _src WHERE _src.cartodb_id=_dst.cartodb_id)',
fq_dest_table, src_table); fq_dest_table, src_table);
GET DIAGNOSTICS num_rows = ROW_COUNT; GET DIAGNOSTICS num_rows = ROW_COUNT;
RAISE NOTICE 'DELETED % row(s)', num_rows; RAISE NOTICE 'DELETED % row(s)', num_rows;
@ -153,8 +141,8 @@ BEGIN
t := clock_timestamp(); t := clock_timestamp();
EXECUTE format(' EXECUTE format('
INSERT INTO %1$s(cartodb_id, %2$s) INSERT INTO %1$s(cartodb_id, %2$s)
SELECT cartodb_id, %2$s FROM %3$I _src WHERE NOT EXISTS (SELECT * FROM %1$s _dst WHERE _src.cartodb_id=_dst.cartodb_id) SELECT cartodb_id, %2$s FROM %3$s _src WHERE NOT EXISTS (SELECT * FROM %1$s _dst WHERE _src.cartodb_id=_dst.cartodb_id)
', fq_dest_table, array_to_string(@extschema@.__CDB_QuoteColumns(colnames), ','), src_table); ', fq_dest_table, array_to_string(colnames, ','), src_table);
GET DIAGNOSTICS num_rows = ROW_COUNT; GET DIAGNOSTICS num_rows = ROW_COUNT;
RAISE NOTICE 'INSERTED % row(s)', num_rows; RAISE NOTICE 'INSERTED % row(s)', num_rows;
RAISE DEBUG 'INSERT time (s): %', clock_timestamp() - t; RAISE DEBUG 'INSERT time (s): %', clock_timestamp() - t;