Merge pull request #74 from CartoDB/73-fix-timestamps

Fix conversion of strings to datetimes #73
2015-03-03 11:03:27 +01:00 · 2015-03-03 09:49:33 +00:00 · 2015-02-27 11:08:19 +01:00 · 2015-02-27 10:58:13 +01:00 · 2015-02-27 10:53:14 +01:00 · 2015-02-19 14:34:32 +01:00
6 changed files with 19 additions and 9 deletions
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
 # cartodb/Makefile

 EXTENSION = cartodb
-EXTVERSION = 0.7.0
+EXTVERSION = 0.7.2

 SED = sed

@@ -34,6 +34,8 @@ UPGRADABLE = \
  0.5.2 \
  0.5.3 \
  0.6.0 \
+  0.7.0 \
+  0.7.1 \
  $(EXTVERSION)dev \
  $(EXTVERSION)next \
  $(END)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,11 @@
+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
--- a/scripts-available/CDB_Quota.sql
+++ b/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
--- a/scripts-available/CDB_StringToDate.sql
+++ b/scripts-available/CDB_StringToDate.sql
@@ -1,8 +1,8 @@
 -- Convert string to date
 --
 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;
--- a/test/CDB_QuotaTest_expect
+++ b/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
--- a/test/extension/test.sh
+++ b/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
Author	SHA1	Message	Date
Rafa de la Torre	e80ea92c57	Merge pull request #74 from CartoDB/73-fix-timestamps Fix conversion of strings to datetimes #73	2015-03-03 11:03:27 +01:00
Rafa de la Torre	61804187c8	Fix conversion of strings to datetimes #73	2015-03-03 09:49:33 +00:00
Kartones	9114d4e463	#revert-size_calc Stop this madness	2015-02-27 11:08:19 +01:00
Kartones	5db9dc6a9f	#revert-size_calc 3KB diff at expected result	2015-02-27 10:58:13 +01:00
Kartones	0a3d08edc3	#revert-size_calc	2015-02-27 10:53:14 +01:00
Raul Ochoa	b913defebb	Stubs next version	2015-02-19 14:34:32 +01:00