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

Make cartodb_id inconsistencies fail and update tests

Browse Source
This commit is contained in:
Carla Iriberri
2016-03-08 11:58:30 +01:00
parent 73906b60da
commit f4b51807a1
3 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts-available/CDB_CartodbfyTable.sql
View File

@@ -527,7 +527,7 @@ BEGIN
useable_key := false;
-- Other fatal error
WHEN others THEN
PERFORM _CDB_Error(sql, Format('_CDB_Has_Usable_Primary_ID: %s', SQLERRM));
PERFORM _CDB_Error(sql, Format('_CDB_Has_Usable_Primary_ID: not valid %s', SQLERRM));
END;
-- Clean up test constraint
@@ -538,13 +538,9 @@ BEGIN
ELSE
RAISE DEBUG 'CDB(_CDB_Has_Usable_Primary_ID): %',
Format('found non-unique ''%s'', renaming it', const.pkey);
Format('found non-unique ''%s''', const.pkey);
PERFORM _CDB_SQL(
Format('ALTER TABLE %s RENAME COLUMN %s TO %I',
reloid::text, rec.attname,
cartodb._CDB_Unique_Column_Identifier(NULL, const.pkey, NULL, reloid)),
'_CDB_Has_Usable_Primary_ID');
PERFORM _CDB_Error(sql, Format('_CDB_Has_Usable_Primary_ID: non-unique %s', const.pkey));
END IF;