From 523a4334f8bf80a0c441871db93ae83eaaa2a5ed Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Wed, 18 Jul 2012 11:24:06 +0000 Subject: Rework QueryKit's tests to accept parameters allowing use to run them with different data sets. --- Frameworks/QueryKit/Source/QKQueryConstants.h | 3 +++ Frameworks/QueryKit/Source/QKQueryConstants.m | 32 +++++++++++++++++++++++++++ Frameworks/QueryKit/Source/QKQueryUtilities.m | 4 ++-- Frameworks/QueryKit/Source/QueryKit.h | 1 + 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Frameworks/QueryKit/Source/QKQueryConstants.m (limited to 'Frameworks/QueryKit/Source') diff --git a/Frameworks/QueryKit/Source/QKQueryConstants.h b/Frameworks/QueryKit/Source/QKQueryConstants.h index 57c7a55b..65bfcbd8 100644 --- a/Frameworks/QueryKit/Source/QKQueryConstants.h +++ b/Frameworks/QueryKit/Source/QKQueryConstants.h @@ -29,3 +29,6 @@ // OTHER DEALINGS IN THE SOFTWARE. #define EMPTY_STRING @"" + +extern NSString *QKMySQLIdentifierQuote; +extern NSString *QKPostgreSQLIdentifierQuote; diff --git a/Frameworks/QueryKit/Source/QKQueryConstants.m b/Frameworks/QueryKit/Source/QKQueryConstants.m new file mode 100644 index 00000000..67fb6eb3 --- /dev/null +++ b/Frameworks/QueryKit/Source/QKQueryConstants.m @@ -0,0 +1,32 @@ +// +// $Id$ +// +// QKQueryConstants.m +// QueryKit +// +// Created by Stuart Connolly (stuconnolly.com) on July 17, 2012 +// Copyright (c) 2012 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. + +NSString *QKMySQLIdentifierQuote = @"`"; +NSString *QKPostgreSQLIdentifierQuote = @"\""; diff --git a/Frameworks/QueryKit/Source/QKQueryUtilities.m b/Frameworks/QueryKit/Source/QKQueryUtilities.m index 06396ddc..d376ea57 100644 --- a/Frameworks/QueryKit/Source/QKQueryUtilities.m +++ b/Frameworks/QueryKit/Source/QKQueryUtilities.m @@ -46,10 +46,10 @@ static NSString *QKUnrecognisedQueryOperatorException = @"QKUnrecognisedQueryOpe NSString *character = EMPTY_STRING; if (database == QKDatabaseMySQL) { - character = @"`"; + character = QKMySQLIdentifierQuote; } else if (database == QKDatabasePostgreSQL) { - character = @""""; + character = QKPostgreSQLIdentifierQuote; } return character; diff --git a/Frameworks/QueryKit/Source/QueryKit.h b/Frameworks/QueryKit/Source/QueryKit.h index 0ae6b406..3a57920d 100644 --- a/Frameworks/QueryKit/Source/QueryKit.h +++ b/Frameworks/QueryKit/Source/QueryKit.h @@ -31,6 +31,7 @@ #import #import #import +#import #import #import #import -- cgit v1.2.3