Helpers::detectTypes() added support for TIMESTAMP WITH TIME ZONE in PostgreSQL [Closes #163]

Author: dg

src/Database/Helpers.php

@@ -31,7 +31,7 @@ class Helpers
 		'BOOL(EAN)?' => IStructure::FIELD_BOOL,
 		'TIME' => IStructure::FIELD_TIME,
 		'DATE' => IStructure::FIELD_DATE,
-		'(SMALL)?DATETIME(OFFSET)?\d*|TIME(STAMP)?' => IStructure::FIELD_DATETIME,
+		'(SMALL)?DATETIME(OFFSET)?\d*|TIME(STAMP.*)?' => IStructure::FIELD_DATETIME,
 		'BYTEA|(TINY|MEDIUM|LONG|)BLOB|(LONG )?(VAR)?BINARY|IMAGE' => IStructure::FIELD_BINARY,
 	];
 

tests/Database/ResultSet.normalizeRow.postgre.phpt

@@ -32,6 +32,7 @@ Assert::equal([
 	'date' => new DateTime('2012-10-13'),
 	'time' => new DateTime('10:10:10'),
 	'timestamp' => new DateTime('2012-10-13 10:10:10'),
+	'timestampZone' => new DateTime('2012-10-13 09:10:10+00'),
 	'interval' => '1 year',
 	'character' => 'a                             ',
 	'character_varying' => 'a',
@@ -66,6 +67,7 @@ Assert::same([
 	'date' => NULL,
 	'time' => NULL,
 	'timestamp' => NULL,
+	'timestampZone' => NULL,
 	'interval' => '00:00:00',
 	'character' => '                              ',
 	'character_varying' => '',
@@ -100,6 +102,7 @@ Assert::same([
 	'date' => NULL,
 	'time' => NULL,
 	'timestamp' => NULL,
+	'timestampZone' => NULL,
 	'interval' => NULL,
 	'character' => NULL,
 	'character_varying' => NULL,

tests/Database/files/pgsql-nette_test3.sql

@@ -10,6 +10,7 @@ CREATE TEMPORARY TABLE "types" (
   "date" date NULL,
   "time" time NULL,
   "timestamp" timestamp NULL,
+  "timestampZone" timestamp with time zone NULL,
   "interval" interval NULL,
   "character" character(30) NULL,
   "character_varying" character varying(30) NULL,
@@ -32,11 +33,11 @@ CREATE TEMPORARY TABLE "types" (
   "polygon" polygon NULL
 );
 
-INSERT INTO "types" ("smallint", "integer", "bigint", "numeric", "real", "double", "money", "bool", "date", "time", "timestamp", "interval", "character", "character_varying", "text", "tsquery", "tsvector", "uuid", "xml", "cidr", "inet", "macaddr", "bit", "bit_varying", "box", "circle", "lseg", "path", "point", "polygon")
-VALUES ('1', '1', '1', '1.00', '1.10', '1.11', '0', 'T', '2012-10-13', '10:10:10', '2012-10-13 10:10:10', '1 year', 'a', 'a', 'a', 'a', 'a', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'a', '192.168.1', '192.168.1.1', '08002b:010203', '1', '1', '10,20,30,40', '10,20,30', '10,20,30,40', '10,20,30,40', '10,20', '10,20,30,40');
+INSERT INTO "types" ("smallint", "integer", "bigint", "numeric", "real", "double", "money", "bool", "date", "time", "timestamp", "timestampZone", "interval", "character", "character_varying", "text", "tsquery", "tsvector", "uuid", "xml", "cidr", "inet", "macaddr", "bit", "bit_varying", "box", "circle", "lseg", "path", "point", "polygon")
+VALUES ('1', '1', '1', '1.00', '1.10', '1.11', '0', 'T', '2012-10-13', '10:10:10', '2012-10-13 10:10:10', '2012-10-13 10:10:10+01', '1 year', 'a', 'a', 'a', 'a', 'a', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'a', '192.168.1', '192.168.1.1', '08002b:010203', '1', '1', '10,20,30,40', '10,20,30', '10,20,30,40', '10,20,30,40', '10,20', '10,20,30,40');
 
-INSERT INTO "types" ("smallint", "integer", "bigint", "numeric", "real", "double", "money", "bool", "date", "time", "timestamp", "interval", "character", "character_varying", "text", "tsquery", "tsvector", "uuid", "xml", "cidr", "inet", "macaddr", "bit", "bit_varying", "box", "circle", "lseg", "path", "point", "polygon")
-VALUES ('0', '0', '0', '0.00', '0.0', '0.0', NULL, 'F', NULL, NULL, NULL, '0 year', '', '', '', '', '', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'a', '192.168.1', '192.168.1.1', '08002b:010203', '0', '0', '10,20,30,40', '10,20,30', '10,20,30,40', '10,20,30,40', '10,20', '10,20,30,40');
+INSERT INTO "types" ("smallint", "integer", "bigint", "numeric", "real", "double", "money", "bool", "date", "time", "timestamp", "timestampZone", "interval", "character", "character_varying", "text", "tsquery", "tsvector", "uuid", "xml", "cidr", "inet", "macaddr", "bit", "bit_varying", "box", "circle", "lseg", "path", "point", "polygon")
+VALUES ('0', '0', '0', '0.00', '0.0', '0.0', NULL, 'F', NULL, NULL, NULL, NULL, '0 year', '', '', '', '', '', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'a', '192.168.1', '192.168.1.1', '08002b:010203', '0', '0', '10,20,30,40', '10,20,30', '10,20,30,40', '10,20,30,40', '10,20', '10,20,30,40');
 
-INSERT INTO "types" ("smallint", "integer", "bigint", "numeric", "real", "double", "money", "bool", "date", "time", "timestamp", "interval", "character", "character_varying", "text", "tsquery", "tsvector", "uuid", "xml", "cidr", "inet", "macaddr", "bit", "bit_varying", "box", "circle", "lseg", "path", "point", "polygon")
-VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO "types" ("smallint", "integer", "bigint", "numeric", "real", "double", "money", "bool", "date", "time", "timestamp", "timestampZone", "interval", "character", "character_varying", "text", "tsquery", "tsvector", "uuid", "xml", "cidr", "inet", "macaddr", "bit", "bit_varying", "box", "circle", "lseg", "path", "point", "polygon")
+VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);