Merge tag '0.3.5' into cdb

Release 0.3.5 fixed

.gitignore

@@ -5,3 +5,4 @@ results/
 regression.*
 expected/test
 sql/test
+.idea/*

Makefile

@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.3.4
+EXTVERSION = 0.3.5
 
 SED = sed
 
@@ -24,6 +24,7 @@ UPGRADABLE = \
   0.3.1 \
   0.3.2 \
   0.3.3 \
+  0.3.4 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)

NEWS

@@ -1,4 +1,12 @@
-0.3.3 (2014-07-xx)
+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-01)
+------------------
+Fixes issue with schemas in CDB_QueryTables
+
+0.3.3 (2014-07-30)
 ------------------
 * 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
-    qmax := TG_ARGV[1];
-  ELSE
+
+  -- By default try to use quota function, and if not present then rely on the one specified by params
+  BEGIN
+    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;
-      EXCEPTION WHEN undefined_function THEN
-      RAISE EXCEPTION 'Missing "%"._CDB_UserQuotaInBytes()', schema_name;
+      IF TG_NARGS >= 2 AND TG_ARGV[1] <> '-1' THEN
+        qmax := TG_ARGV[1];
+      ELSE
+        RAISE EXCEPTION 'Missing "%"._CDB_UserQuotaInBytes()', schema_name;
+      END IF;
     END;
-  END IF;
+  END;
+
   pbfact := TG_ARGV[0];
 
   dice := random();