Merge pull request #75 from CartoDB/73-fix-upgrade-of-cdb-stringtodate

73 fix upgrade of cdb stringtodate

Makefile

@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.7.0
+EXTVERSION = 0.7.3
 
 SED = sed
 
@@ -34,6 +34,9 @@ UPGRADABLE = \
   0.5.2 \
   0.5.3 \
   0.6.0 \
+  0.7.0 \
+  0.7.1 \
+  0.7.2 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)

NEWS.md

@@ -1,3 +1,16 @@
+0.7.3 (2015-03-03)
+------------------
+* Fix upgrade of CDB_StringToDate function
+* Add a test for to validate CDB_TableMetadataTouch usage with OID
+
+0.7.2 (2015-03-03)
+------------------
+* Fix conversion of strings to datetime
+
+0.7.1 (2015-02-27)
+------------------
+* Revert quota checks to `pg_total_relation_size`
+
 0.7.0 (2015-02-19)
 ------------------
 * Adds CDB_ZoomFromScale function

scripts-available/CDB_Quota.sql

@@ -24,7 +24,7 @@ BEGIN
     FROM user_tables
   ),
   sizes AS (
-    SELECT COALESCE(INT8(SUM(pg_relation_size('"' || schema_name || '"."' || table_name || '"')))) table_size,
+    SELECT COALESCE(INT8(SUM(pg_total_relation_size('"' || schema_name || '"."' || table_name || '"')))) table_size,
       CASE
         WHEN is_overview THEN 0
 	WHEN is_raster THEN 1

scripts-available/CDB_StringToDate.sql

@@ -1,8 +1,9 @@
 -- Convert string to date
 --
+DROP FUNCTION IF EXISTS CDB_StringToDate(character varying);
 CREATE OR REPLACE FUNCTION CDB_StringToDate(input character varying)
-RETURNS date AS $$
-DECLARE output DATE;
+RETURNS TIMESTAMP AS $$
+DECLARE output TIMESTAMP;
 BEGIN
     BEGIN
         output := input::date;

test/CDB_QuotaTest_expect

@@ -9,7 +9,7 @@ INSERT 0 2048
 INSERT 0 2048
 INSERT 0 2048
 2
-ERROR:  Quota exceeded by 159.998046875KB
+ERROR:  Quota exceeded by 567.998046875KB
 0
 INSERT 0 1
 DROP TABLE

test/extension/test.sh

@@ -270,13 +270,13 @@ function test_quota_for_each_user() {
     create_raster_table cdb_testmember_1 raster_1
     create_raster_table cdb_testmember_2 raster_2
 
-    sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 4096
-    sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 4096
+    sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 20480
+    sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 20480
 
     create_raster_table cdb_testmember_1 raster_3
 
-    sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 4096
-    sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 4096
+    sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 36864
+    sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 20480
 
     drop_raster_table cdb_testmember_1 raster_1
     drop_raster_table cdb_testmember_2 raster_2
@@ -302,6 +302,10 @@ function test_cdb_tablemetadatatouch() {
     sql "SELECT CDB_TableMetadataTouch('\"public\".touch_example');"
     sql "SELECT CDB_TableMetadataTouch('\"public\".\"touch_example\"');"
 
+    # Works with OID
+    TABLE_OID=`${CMD} -U postgres ${DATABASE} -c "SELECT tableoid FROM pg_attribute WHERE attrelid = 'touch_example'::regclass limit 1;" -A -t`
+    sql "SELECT CDB_TableMetadataTouch('${TABLE_OID}');"
+
     #### test tear down
     sql 'DROP TABLE touch_example;'
 }