cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug that checks only for name of the custom type and not uses the

Browse Source 
namespace
This commit is contained in:
Mario de Frutos
2018-01-16 18:28:54 +01:00
parent 41916eed18
commit 7d8cc4ae87
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/extension/cdb_dataservices_server--0.30.0.sql
+6 -2
View File
@@ -1766,7 +1766,9 @@ RETURNS boolean AS $$
$$ LANGUAGE plpythonu SECURITY DEFINER STABLE PARALLEL RESTRICTED; $$ LANGUAGE plpythonu SECURITY DEFINER STABLE PARALLEL RESTRICTED;
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'service_type') THEN IF NOT EXISTS (SELECT 1 FROM pg_type inner join pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
WHERE pg_type.typname = 'service_type'
AND pg_namespace.nspname = 'cdb_dataservices_server') THEN
CREATE TYPE cdb_dataservices_server.service_type AS ENUM ( CREATE TYPE cdb_dataservices_server.service_type AS ENUM (
'isolines', 'isolines',
'hires_geocoder', 'hires_geocoder',
@@ -1778,7 +1780,9 @@ END $$;
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'service_quota_info') THEN IF NOT EXISTS (SELECT 1 FROM pg_type inner join pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
WHERE pg_type.typname = 'service_quota_info'
AND pg_namespace.nspname = 'cdb_dataservices_server') THEN
CREATE TYPE cdb_dataservices_server.service_quota_info AS ( CREATE TYPE cdb_dataservices_server.service_quota_info AS (
service cdb_dataservices_server.service_type, service cdb_dataservices_server.service_type,
monthly_quota NUMERIC, monthly_quota NUMERIC,
server/extension/sql/200_quotas.sql
+6 -2
View File
@@ -1,6 +1,8 @@
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'service_type') THEN IF NOT EXISTS (SELECT 1 FROM pg_type inner join pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
WHERE pg_type.typname = 'service_type'
AND pg_namespace.nspname = 'cdb_dataservices_server') THEN
CREATE TYPE cdb_dataservices_server.service_type AS ENUM ( CREATE TYPE cdb_dataservices_server.service_type AS ENUM (
'isolines', 'isolines',
'hires_geocoder', 'hires_geocoder',
@@ -12,7 +14,9 @@ END $$;
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'service_quota_info') THEN IF NOT EXISTS (SELECT 1 FROM pg_type inner join pg_namespace ON (pg_type.typnamespace = pg_namespace.oid)
WHERE pg_type.typname = 'service_quota_info'
AND pg_namespace.nspname = 'cdb_dataservices_server') THEN
CREATE TYPE cdb_dataservices_server.service_quota_info AS ( CREATE TYPE cdb_dataservices_server.service_quota_info AS (
service cdb_dataservices_server.service_type, service cdb_dataservices_server.service_type,
monthly_quota NUMERIC, monthly_quota NUMERIC,