From: Jay Smith <jay@php.net>
Date: Wed, 2 Apr 2003 00:00:09 +0000 (+0000)
Subject: @- Fixed bug #23009 (pg_select with timestamp). (Marcus, Jay)
X-Git-Tag: php-4.3.2RC2~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=930347763b0567381d48cb4ffcda0e4c96d72b9b;p=php

@- Fixed bug #23009 (pg_select with timestamp). (Marcus, Jay)
MFH
---

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 5e35d41869..ed54b149f1 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -3203,8 +3203,10 @@ static php_pgsql_data_type php_pgsql_get_data_type(const char *type_name, size_t
 		return PG_DATE;
 	if (!strcmp(type_name, "time"))
 		return PG_TIME;
-	if (!strcmp(type_name, "timestamp") || !strcmp(type_name, "time with time zone"))
+	if (!strcmp(type_name, "time with time zone") || !strcmp(type_name, "timetz"))
 		return PG_TIME_WITH_TIMEZONE;
+	if (!strcmp(type_name, "timestamp without time zone") || !strcmp(type_name, "timestamp"))
+		return PG_TIMESTAMP;
 	if (!strcmp(type_name, "timestamp with time zone") || !strcmp(type_name, "timestamptz"))
 		return PG_TIMESTAMP_WITH_TIMEZONE;
 	if (!strcmp(type_name, "interval"))
@@ -3657,6 +3659,7 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval
 				break;
 				
 			case PG_TIME_WITH_TIMEZONE:
+			case PG_TIMESTAMP:
 			case PG_TIMESTAMP_WITH_TIMEZONE:
 				switch(Z_TYPE_PP(val)) {
 					case IS_STRING:
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index fbc4b90164..429cefe53d 100644
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -196,6 +196,7 @@ typedef enum _php_pgsql_data_type {
 	PG_DATE,
 	PG_TIME,
 	PG_TIME_WITH_TIMEZONE,
+	PG_TIMESTAMP,
 	PG_TIMESTAMP_WITH_TIMEZONE,
 	PG_INTERVAL,
 	/* binary */