Add constants for all MySQL data types.

4 files changed, 159 insertions, 0 deletions

diff --git a/Frameworks/SPMySQLFramework/SPMySQLDataTypes.h b/Frameworks/SPMySQLFramework/SPMySQLDataTypes.h
new file mode 100644
index 00000000..5a4ec645
--- /dev/null
+++ b/Frameworks/SPMySQLFramework/SPMySQLDataTypes.h
@@ -0,0 +1,74 @@
+//
+//  SPMySQLDataTypes.h
+//  SPMySQLFramework
+//
+//  Created by Stuart Connolly (stuconnolly.com) on January 14, 2014.
+//  Copyright (c) 2014 Stuart Connolly. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the "Software"), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+extern NSString *SPMySQLTinyIntType;
+extern NSString *SPMySQLSmallIntType;
+extern NSString *SPMySQLMediumIntType;
+extern NSString *SPMySQLIntType;
+extern NSString *SPMySQLBigIntType;
+extern NSString *SPMySQLFloatType;
+extern NSString *SPMySQLDoubleType;
+extern NSString *SPMySQLDoublePrecisionType;
+extern NSString *SPMySQLRealType;
+extern NSString *SPMySQLDecimalType;
+extern NSString *SPMySQLBitType;
+extern NSString *SPMySQLSerialType;
+extern NSString *SPMySQLBoolType;
+extern NSString *SPMySQLBoolean;
+extern NSString *SPMySQLDecType;
+extern NSString *SPMySQLFixedType;
+extern NSString *SPMySQLNumericType;
+extern NSString *SPMySQLCharType;
+extern NSString *SPMySQLVarCharType;
+extern NSString *SPMySQLTinyTextType;
+extern NSString *SPMySQLTextType;
+extern NSString *SPMySQLMediumTextType;
+extern NSString *SPMySQLLongTextType;
+extern NSString *SPMySQLTinyBlobType;
+extern NSString *SPMySQLMediumBlobType;
+extern NSString *SPMySQLBlobType;
+extern NSString *SPMySQLLongBlobType;
+extern NSString *SPMySQLBinaryType;
+extern NSString *SPMySQLVarBinaryType;
+extern NSString *SPMySQLEnumType;
+extern NSString *SPMySQLSetType;
+extern NSString *SPMySQLDateType;
+extern NSString *SPMySQLDatetimeType;
+extern NSString *SPMySQLTimestampType;
+extern NSString *SPMySQLTimeType;
+extern NSString *SPMySQLYearType;
+extern NSString *SPMySQLGeometryType;
+extern NSString *SPMySQLPointType;
+extern NSString *SPMySQLLineStringType;
+extern NSString *SPMySQLPolygonType;
+extern NSString *SPMySQLMultiPointType;
+extern NSString *SPMySQLMultiLineStringType;
+extern NSString *SPMySQLMultiPolygonType;
+extern NSString *SPMySQLGeometryCollectionType;
diff --git a/Frameworks/SPMySQLFramework/SPMySQLDataTypes.m b/Frameworks/SPMySQLFramework/SPMySQLDataTypes.m
new file mode 100644
index 00000000..236e9bda
--- /dev/null
+++ b/Frameworks/SPMySQLFramework/SPMySQLDataTypes.m
@@ -0,0 +1,76 @@
+//
+//  SPMySQLDataTypes.m
+//  SPMySQLFramework
+//
+//  Created by Stuart Connolly (stuconnolly.com) on January 14, 2014.
+//  Copyright (c) 2014 Stuart Connolly. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the "Software"), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+#import "SPMySQLDataTypes.h"
+
+NSString *SPMySQLTinyIntType            = @"TINYINT";
+NSString *SPMySQLSmallIntType           = @"SMALLINT";
+NSString *SPMySQLMediumIntType          = @"MEDIUMINT";
+NSString *SPMySQLIntType                = @"INT";
+NSString *SPMySQLBigIntType             = @"BIGINT";
+NSString *SPMySQLFloatType              = @"FLOAT";
+NSString *SPMySQLDoubleType             = @"DOUBLE";
+NSString *SPMySQLDoublePrecisionType    = @"DOUBLE PRECISION";
+NSString *SPMySQLRealType               = @"REAL";
+NSString *SPMySQLDecimalType            = @"DECIMAL";
+NSString *SPMySQLBitType                = @"BIT";
+NSString *SPMySQLSerialType             = @"SERIAL";
+NSString *SPMySQLBoolType               = @"BOOL";
+NSString *SPMySQLBoolean                = @"BOOLEAN";
+NSString *SPMySQLDecType                = @"DEC";
+NSString *SPMySQLFixedType              = @"FIXED";
+NSString *SPMySQLNumericType            = @"NUMERIC";
+NSString *SPMySQLCharType               = @"CHAR";
+NSString *SPMySQLVarCharType            = @"VARCHAR";
+NSString *SPMySQLTinyTextType           = @"TINYTEXT";
+NSString *SPMySQLTextType               = @"TEXT";
+NSString *SPMySQLMediumTextType         = @"MEDIUMTEXT";
+NSString *SPMySQLLongTextType           = @"LONGTEXT";
+NSString *SPMySQLTinyBlobType           = @"TINYBLOB";
+NSString *SPMySQLMediumBlobType         = @"MEDIUMBLOB";
+NSString *SPMySQLBlobType               = @"BLOB";
+NSString *SPMySQLLongBlobType           = @"LONGBLOB";
+NSString *SPMySQLBinaryType             = @"BINARY";
+NSString *SPMySQLVarBinaryType          = @"VARBINARY";
+NSString *SPMySQLEnumType               = @"ENUM";
+NSString *SPMySQLSetType                = @"SET";
+NSString *SPMySQLDateType               = @"DATE";
+NSString *SPMySQLDatetimeType           = @"DATETIME";
+NSString *SPMySQLTimestampType          = @"TIMESTAMP";
+NSString *SPMySQLTimeType               = @"TIME";
+NSString *SPMySQLYearType               = @"YEAR";
+NSString *SPMySQLGeometryType           = @"GEOMETRY";
+NSString *SPMySQLPointType              = @"POINT";
+NSString *SPMySQLLineStringType         = @"LINESTRING";
+NSString *SPMySQLPolygonType            = @"POLYGON";
+NSString *SPMySQLMultiPointType         = @"MULTIPOINT";
+NSString *SPMySQLMultiLineStringType    = @"MULTILINESTRING";
+NSString *SPMySQLMultiPolygonType       = @"MULTIPOLYGON";
+NSString *SPMySQLGeometryCollectionType = @"GEOMETRYCOLLECTION";
diff --git a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
index bd33a4fb..c114d193 100644
--- a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
+++ b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		17E3A57B1885A286009CF372 /* SPMySQLDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E3A5791885A286009CF372 /* SPMySQLDataTypes.h */; };
+		17E3A57C1885A286009CF372 /* SPMySQLDataTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E3A57A1885A286009CF372 /* SPMySQLDataTypes.m */; };
 		580A331E14D75CF7000D6933 /* SPMySQLGeometryData.h in Headers */ = {isa = PBXBuildFile; fileRef = 580A331C14D75CF7000D6933 /* SPMySQLGeometryData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		580A331F14D75CF7000D6933 /* SPMySQLGeometryData.m in Sources */ = {isa = PBXBuildFile; fileRef = 580A331D14D75CF7000D6933 /* SPMySQLGeometryData.m */; };
 		583C734A17A489CC0056B284 /* SPMySQLStreamingResultStoreDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 583C734917A489CC0056B284 /* SPMySQLStreamingResultStoreDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -78,6 +80,8 @@
 		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		17E3A5791885A286009CF372 /* SPMySQLDataTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMySQLDataTypes.h; sourceTree = "<group>"; };
+		17E3A57A1885A286009CF372 /* SPMySQLDataTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMySQLDataTypes.m; sourceTree = "<group>"; };
 		32DBCF5E0370ADEE00C91783 /* SPMySQLFramework_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPMySQLFramework_Prefix.pch; path = Source/SPMySQLFramework_Prefix.pch; sourceTree = "<group>"; };
 		580A331C14D75CF7000D6933 /* SPMySQLGeometryData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPMySQLGeometryData.h; path = Source/SPMySQLGeometryData.h; sourceTree = "<group>"; };
 		580A331D14D75CF7000D6933 /* SPMySQLGeometryData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPMySQLGeometryData.m; path = Source/SPMySQLGeometryData.m; sourceTree = "<group>"; };
@@ -258,6 +262,8 @@
 				584294E314CB8002000F8438 /* SPMySQLConstants.h */,
 				58C006C714E0B18A00AC489A /* SPMySQLUtilities.h */,
 				32DBCF5E0370ADEE00C91783 /* SPMySQLFramework_Prefix.pch */,
+				17E3A5791885A286009CF372 /* SPMySQLDataTypes.h */,
+				17E3A57A1885A286009CF372 /* SPMySQLDataTypes.m */,
 			);
 			name = "Other Sources";
 			sourceTree = "<group>";
@@ -401,6 +407,7 @@
 				584292A414C34B36000F8438 /* mysql_time.h in Headers */,
 				584292A514C34B36000F8438 /* mysql_version.h in Headers */,
 				584292A614C34B36000F8438 /* typelib.h in Headers */,
+				17E3A57B1885A286009CF372 /* SPMySQLDataTypes.h in Headers */,
 				5884127714CC63830078027F /* SPMySQL.h in Headers */,
 				588412A814CC7A4D0078027F /* Locking.h in Headers */,
 				5884142714CCF5190078027F /* Conversion.h in Headers */,
@@ -498,6 +505,7 @@
 				5884142814CCF5190078027F /* Conversion.m in Sources */,
 				5884159514D1A6880078027F /* Querying & Preparation.m in Sources */,
 				5884159414D1A6760078027F /* Locking.m in Sources */,
+				17E3A57C1885A286009CF372 /* SPMySQLDataTypes.m in Sources */,
 				5884165614D2306A0078027F /* SPMySQLResult.m in Sources */,
 				580A331F14D75CF7000D6933 /* SPMySQLGeometryData.m in Sources */,
 				58C7C1E514DB6E4C00436315 /* SPMySQLFastStreamingResult.m in Sources */,
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQL.h b/Frameworks/SPMySQLFramework/Source/SPMySQL.h
index 1e618a18..ad502e8c 100644
--- a/Frameworks/SPMySQLFramework/Source/SPMySQL.h
+++ b/Frameworks/SPMySQLFramework/Source/SPMySQL.h
@@ -35,6 +35,7 @@
 // Global include file for the framework.
 // Constants
 #import "SPMySQLConstants.h"
+#import "SPMySQLDataTypes.h"
 
 // Required category additions
 #ifndef SP_CODA