Additional type support.

5 files changed, 13 insertions, 8 deletions

diff --git a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj
index 84af5f2d..3f992739 100644
--- a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj
+++ b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj
@@ -166,6 +166,7 @@
 				173D4E2F15BAB13C0007F267 /* PostgresKit-Prefix.pch */,
 				173D4E2115BAB0FE0007F267 /* Source */,
 				089C1665FE841158C02AAC07 /* Resources */,
+				173D4EDE15BACA090007F267 /* Libs */,
 				0867D69AFE84028FC02AAC07 /* Frameworks */,
 				034768DFFF38A50411DB9C8B /* Products */,
 			);
@@ -187,7 +188,6 @@
 			children = (
 				8DC2EF5A0486A6940098B216 /* Info.plist */,
 				1724CD0515FB68E800AB2291 /* Tests-Info.plist */,
-				173D4EDE15BACA090007F267 /* Libs */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
diff --git a/Frameworks/PostgresKit/Resources/TestData.sql b/Frameworks/PostgresKit/Resources/TestData.sql
index 14849f77..5d946918 100644
--- a/Frameworks/PostgresKit/Resources/TestData.sql
+++ b/Frameworks/PostgresKit/Resources/TestData.sql
@@ -18,6 +18,7 @@ CREATE TABLE IF NOT EXISTS data_types
 (
 	int_field INT PRIMARY KEY NOT NULL,
 	smallint_field SMALLINT NOT NULL,
+	bigint_field BIGINT NOT NULL,
 	bool_field BOOL NOT NULL,
 	float_field REAL NOT NULL,
 	char_field CHAR(5) NOT NULL,
@@ -47,7 +48,8 @@ INSERT INTO data_types (
 VALUES (
 	12345, 
 	2, 
-	TRUE, 
+	TRUE,
+	123456789,
 	12345.678, 
 	'CHARV', 
 	'VARCHAR_VALUE', 
diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m b/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m
index 5ea07047..d9395398 100644
--- a/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m
+++ b/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m
@@ -29,7 +29,8 @@ static FLXPostgresOid FLXPostgresTypeNumberTypes[] =
 	FLXPostgresOidInt4,
 	FLXPostgresOidFloat4,
 	FLXPostgresOidFloat8,
-	FLXPostgresOidBool,  
+	FLXPostgresOidBool,
+	FLXPostgresOidOid,
 	0 
 };
 
diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m b/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m
index fb72346b..2b1d4330 100644
--- a/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m
+++ b/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m
@@ -30,6 +30,8 @@ static FLXPostgresOid FLXPostgresTypeStringTypes[] =
 	FLXPostgresOidName,
 	FLXPostgresOidNumeric,
 	FLXPostgresOidVarchar,
+	FLXPostgresOidXML,
+	FLXPostgresOidUUID,
 	FLXPostgresOidUnknown,
 	0 
 };
diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypes.h b/Frameworks/PostgresKit/Source/FLXPostgresTypes.h
index 3216ad98..5c09e5d8 100644
--- a/Frameworks/PostgresKit/Source/FLXPostgresTypes.h
+++ b/Frameworks/PostgresKit/Source/FLXPostgresTypes.h
@@ -31,7 +31,7 @@ enum
 {
 	// BOOL
 	FLXPostgresOidBool         = 16,  // NumberHandler              => NSNumber
-	FLXPostgresOidData         = 17,  // Currently not supported    
+	FLXPostgresOidByteData     = 17,  // Currently not supported    
 	
 	// Text
 	FLXPostgresOidName         = 19,  // StringHandler              => NSString   
@@ -45,10 +45,10 @@ enum
 	FLXPostgresOidText         = 25,  // StringHandler              => NSString
 	
 	// OID
-	FLXPostgresOidOid          = 26,  // Currently not supported
+	FLXPostgresOidOid          = 26,  // NumberHandler              => NSNumber
 	
 	// XML
-	FLXPostgresOidXML          = 142, // Currently not supported
+	FLXPostgresOidXML          = 142, // StringHandler              => NSString
 	
 	// Geometric
 	FLXPostgresOidPoint        = 600, // Currently not supported
@@ -76,7 +76,6 @@ enum
 	// Network
 	FLXPostgresOidMacAddr      = 829, // Currently not supported
 	FLXPostgresOidIPAddr       = 869, // Currently not supported
-	FLXPostgresOidNetAddr      = 869, // Currently not supported
 	
 	// Arrays
 	FLXPostgresOidArrayBool    = 1000, // Currently not supported
@@ -111,5 +110,6 @@ enum
 	
 	// Numeric
 	FLXPostgresOidNumeric      = 1700, // StringHandler              => NSString
-	FLXPostgresOidMax          = 1700  // Currently not supported
+	
+	FLXPostgresOidUUID         = 2950  // StringHandler              => NSString
 };