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

Remove unnecessary changes

Browse Source
This commit is contained in:
Raul Marin 2019-05-31 15:52:55 +02:00
parent 8e68f2a0a7
commit 010cbe6e18
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/organization/test.sh
View File

@ -253,9 +253,6 @@ function run_tests() {
setup setup
for t in ${TESTS} for t in ${TESTS}
do do
# if [[ ${t} != "test_cdb_usertables_should_work_with_orgusers" ]]; then
# continue;
# fi
echo "####################################################################" echo "####################################################################"
echo "#" echo "#"
echo "# Running: ${t}" echo "# Running: ${t}"

10
util/create_from_unpackaged.sh
View File

@ -23,9 +23,9 @@ cat ${input} | grep -v 'duplicated extension$' >> ${output}
# Migrate CDB_TableMetadata # Migrate CDB_TableMetadata
cat >> ${output} <<'EOF' cat >> ${output} <<'EOF'
ALTER TABLE @extschema@.CDB_TableMetadata DISABLE TRIGGER ALL; ALTER TABLE cartodb.CDB_TableMetadata DISABLE TRIGGER ALL;
INSERT INTO @extschema@.CDB_TableMetadata SELECT * FROM public.CDB_TableMetadata; INSERT INTO cartodb.CDB_TableMetadata SELECT * FROM public.CDB_TableMetadata;
ALTER TABLE @extschema@.CDB_TableMetadata ENABLE TRIGGER ALL; ALTER TABLE cartodb.CDB_TableMetadata ENABLE TRIGGER ALL;
DROP TABLE public.CDB_TableMetadata; DROP TABLE public.CDB_TableMetadata;
-- Set user quota -- Set user quota
@ -40,7 +40,7 @@ BEGIN
EXCEPTION WHEN undefined_function THEN EXCEPTION WHEN undefined_function THEN
RAISE EXCEPTION 'Please set user quota before switching to cartodb extension'; RAISE EXCEPTION 'Please set user quota before switching to cartodb extension';
END; END;
PERFORM @extschema@.CDB_SetUserQuotaInBytes(qmax); PERFORM cartodb.CDB_SetUserQuotaInBytes(qmax);
DROP FUNCTION public._CDB_UserQuotaInBytes(); DROP FUNCTION public._CDB_UserQuotaInBytes();
END; END;
$$ LANGUAGE 'plpgsql'; $$ LANGUAGE 'plpgsql';
@ -49,7 +49,7 @@ EOF
## Cartodbfy tables with a trigger using 'CDB_CheckQuota' or ## Cartodbfy tables with a trigger using 'CDB_CheckQuota' or
## 'CDB_TableMetadata_Trigger' from the 'public' schema ## 'CDB_TableMetadata_Trigger' from the 'public' schema
#cat >> ${output} <<'EOF' #cat >> ${output} <<'EOF'
#select @extschema@.CDB_CartodbfyTable(relname::regclass) from ( #select cartodb.CDB_CartodbfyTable(relname::regclass) from (
# -- names of tables using public.CDB_CheckQuota or # -- names of tables using public.CDB_CheckQuota or
# -- public.CDB_TableMetadata_Trigger in their triggers # -- public.CDB_TableMetadata_Trigger in their triggers
# SELECT distinct c.relname # SELECT distinct c.relname