Merge pull request #46 from CartoDB/CDB-3870

CDB-3870

NEWS

@@ -1,3 +1,10 @@
+0.3.5 (2014-08-11)
+------------------
+Inverting priority of CDB_CheckQuota qmax so gies more priority to existing user quota function over parameter value.
+
+0.3.4 (2014-08-xx)
+------------------
+
 0.3.3 (2014-07-xx)
 ------------------
 * Splitting of CartodbfyTable method in subfunctions to be able to call in fragments and evade timeouts on hot zones

scripts-available/CDB_Quota.sql

@@ -46,16 +46,20 @@ BEGIN
   ELSE
     schema_name := 'public';
   END IF;
-  -- Hack to support old versions of CDB_CheckQuota with 2 params but without schema_name
+
-  IF TG_NARGS >= 2 AND TG_ARGV[1] <> '-1' THEN
+  -- By default try to use quota function, and if not present then rely on the one specified by params
-    qmax := TG_ARGV[1];
+  BEGIN
-  ELSE
+    EXECUTE FORMAT('SELECT %I._CDB_UserQuotaInBytes();', schema_name) INTO qmax;
+  EXCEPTION WHEN undefined_function THEN
     BEGIN
-      EXECUTE FORMAT('SELECT %I._CDB_UserQuotaInBytes();', schema_name) INTO qmax;
+      IF TG_NARGS >= 2 AND TG_ARGV[1] <> '-1' THEN
-      EXCEPTION WHEN undefined_function THEN
+        qmax := TG_ARGV[1];
-      RAISE EXCEPTION 'Missing "%"._CDB_UserQuotaInBytes()', schema_name;
+      ELSE
+        RAISE EXCEPTION 'Missing "%"._CDB_UserQuotaInBytes()', schema_name;
+      END IF;
     END;
-  END IF;
+  END;
+
   pbfact := TG_ARGV[0];
 
   dice := random();