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

CDB_ColumnType uses schema and table from regclass

Browse Source 
Fixes #130
This commit is contained in:
Raul Ochoa 2015-09-02 12:06:04 +02:00
parent 4b5c5dd275
commit 7582f2cbc5
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts-available/CDB_ColumnType.sql
View File

@ -3,12 +3,13 @@ CREATE OR REPLACE FUNCTION CDB_ColumnType(REGCLASS, TEXT)
RETURNS information_schema.character_data RETURNS information_schema.character_data
AS $$ AS $$
SELECT data_type SELECT c.data_type
FROM information_schema.columns FROM information_schema.columns c, pg_class _tn, pg_namespace _sn
WHERE WHERE table_name = _tn.relname
table_name IN (SELECT CDB_UserTables()) AND table_schema = _sn.nspname
AND table_name = '' || $1 || '' AND column_name = $2
AND column_name = '' || quote_ident($2) || ''; AND _tn.oid = $1::regclass::oid
AND _sn.oid = _tn.relnamespace;
$$ LANGUAGE SQL; $$ LANGUAGE SQL;

14
test/extension/test.sh
View File

@ -351,6 +351,20 @@ function test_cdb_column_names() {
sql cdb_testmember_2 'DROP TABLE cdb_testmember_2.table_cnames' sql cdb_testmember_2 'DROP TABLE cdb_testmember_2.table_cnames'
} }
function test_cdb_column_type() {
sql cdb_testmember_1 'CREATE TABLE cdb_testmember_1.table_ctype(c int, a int, r int, t int, o int);'
sql cdb_testmember_2 'CREATE TABLE cdb_testmember_2.table_ctype(c text, a text, r text, t text, o text);'
sql cdb_testmember_1 "SELECT cartodb.CDB_ColumnType('table_ctype', 'c')" should "integer"
sql cdb_testmember_2 "SELECT cartodb.CDB_ColumnType('table_ctype', 'c')" should "text"
sql postgres "SELECT cartodb.CDB_ColumnType('cdb_testmember_1.table_ctype', 'c')" should "integer"
sql postgres "SELECT cartodb.CDB_ColumnType('cdb_testmember_2.table_ctype', 'c')" should "text"
sql cdb_testmember_1 'DROP TABLE cdb_testmember_1.table_ctype'
sql cdb_testmember_2 'DROP TABLE cdb_testmember_2.table_ctype'
}
#################################################### TESTS END HERE #################################################### #################################################### TESTS END HERE ####################################################
run_tests $@ run_tests $@