diff options
Diffstat (limited to 'Frameworks/PostgresKit')
| -rw-r--r-- | Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj | 32 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresKitPrivateAPI.h | 4 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresTimeInterval.h (renamed from Frameworks/PostgresKit/Source/FLXTimeInterval.h) | 6 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresTimeInterval.m (renamed from Frameworks/PostgresKit/Source/FLXTimeInterval.m) | 6 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresTimeTZ.h (renamed from Frameworks/PostgresKit/Source/FLXTimeTZ.h) | 8 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresTimeTZ.m (renamed from Frameworks/PostgresKit/Source/FLXTimeTZ.m) | 12 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m | 8 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/FLXPostgresTypes.h | 6 |
8 files changed, 41 insertions, 41 deletions
diff --git a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj index 08a1c7c6..84af5f2d 100644 --- a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj +++ b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj @@ -10,12 +10,12 @@ 170465CE15C2960F00DC5BE5 /* FLXPostgresTypeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 170465CC15C2960F00DC5BE5 /* FLXPostgresTypeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; 170465CF15C2960F00DC5BE5 /* FLXPostgresTypeHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 170465CD15C2960F00DC5BE5 /* FLXPostgresTypeHandler.m */; }; 1724C9B815F9ED8600AB2291 /* libpqtypes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1724C9B715F9ED8600AB2291 /* libpqtypes.a */; }; - 1724CC9215FB4CC200AB2291 /* FLXTimeTZ.h in Headers */ = {isa = PBXBuildFile; fileRef = 1724CC9015FB4CC200AB2291 /* FLXTimeTZ.h */; }; - 1724CC9315FB4CC200AB2291 /* FLXTimeTZ.m in Sources */ = {isa = PBXBuildFile; fileRef = 1724CC9115FB4CC200AB2291 /* FLXTimeTZ.m */; }; + 1724CC9215FB4CC200AB2291 /* FLXPostgresTimeTZ.h in Headers */ = {isa = PBXBuildFile; fileRef = 1724CC9015FB4CC200AB2291 /* FLXPostgresTimeTZ.h */; }; + 1724CC9315FB4CC200AB2291 /* FLXPostgresTimeTZ.m in Sources */ = {isa = PBXBuildFile; fileRef = 1724CC9115FB4CC200AB2291 /* FLXPostgresTimeTZ.m */; }; 1724CD1515FB69EC00AB2291 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17E595F114F3058F0054EE08 /* Foundation.framework */; }; 1724CD1815FB6A0500AB2291 /* PostgresKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* PostgresKit.framework */; }; - 1724CD5915FB8A3300AB2291 /* FLXTimeInterval.h in Headers */ = {isa = PBXBuildFile; fileRef = 1724CD5715FB8A3300AB2291 /* FLXTimeInterval.h */; }; - 1724CD5A15FB8A3300AB2291 /* FLXTimeInterval.m in Sources */ = {isa = PBXBuildFile; fileRef = 1724CD5815FB8A3300AB2291 /* FLXTimeInterval.m */; }; + 1724CD5915FB8A3300AB2291 /* FLXPostgresTimeInterval.h in Headers */ = {isa = PBXBuildFile; fileRef = 1724CD5715FB8A3300AB2291 /* FLXPostgresTimeInterval.h */; }; + 1724CD5A15FB8A3300AB2291 /* FLXPostgresTimeInterval.m in Sources */ = {isa = PBXBuildFile; fileRef = 1724CD5815FB8A3300AB2291 /* FLXPostgresTimeInterval.m */; }; 1731F02B15EE09E000D973EB /* FLXPostgresConnectionParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1731F02915EE09E000D973EB /* FLXPostgresConnectionParameters.h */; }; 1731F02C15EE09E000D973EB /* FLXPostgresConnectionParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 1731F02A15EE09E000D973EB /* FLXPostgresConnectionParameters.m */; }; 1731F10815F1A52B00D973EB /* FLXPostgresTypeDateTimeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1731F10615F1A52B00D973EB /* FLXPostgresTypeDateTimeHandler.h */; }; @@ -72,12 +72,12 @@ 170465CD15C2960F00DC5BE5 /* FLXPostgresTypeHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLXPostgresTypeHandler.m; sourceTree = "<group>"; }; 1724C9B715F9ED8600AB2291 /* libpqtypes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpqtypes.a; sourceTree = "<group>"; }; 1724CA3B15F9EE7300AB2291 /* libpqtypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libpqtypes.h; sourceTree = "<group>"; }; - 1724CC9015FB4CC200AB2291 /* FLXTimeTZ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLXTimeTZ.h; sourceTree = "<group>"; }; - 1724CC9115FB4CC200AB2291 /* FLXTimeTZ.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLXTimeTZ.m; sourceTree = "<group>"; }; + 1724CC9015FB4CC200AB2291 /* FLXPostgresTimeTZ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLXPostgresTimeTZ.h; sourceTree = "<group>"; }; + 1724CC9115FB4CC200AB2291 /* FLXPostgresTimeTZ.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLXPostgresTimeTZ.m; sourceTree = "<group>"; }; 1724CD0415FB68E800AB2291 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; 1724CD0515FB68E800AB2291 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "Resources/Tests-Info.plist"; sourceTree = "<group>"; }; - 1724CD5715FB8A3300AB2291 /* FLXTimeInterval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLXTimeInterval.h; sourceTree = "<group>"; }; - 1724CD5815FB8A3300AB2291 /* FLXTimeInterval.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLXTimeInterval.m; sourceTree = "<group>"; }; + 1724CD5715FB8A3300AB2291 /* FLXPostgresTimeInterval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLXPostgresTimeInterval.h; sourceTree = "<group>"; }; + 1724CD5815FB8A3300AB2291 /* FLXPostgresTimeInterval.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLXPostgresTimeInterval.m; sourceTree = "<group>"; }; 1731F02915EE09E000D973EB /* FLXPostgresConnectionParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLXPostgresConnectionParameters.h; sourceTree = "<group>"; }; 1731F02A15EE09E000D973EB /* FLXPostgresConnectionParameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLXPostgresConnectionParameters.m; sourceTree = "<group>"; }; 1731F10615F1A52B00D973EB /* FLXPostgresTypeDateTimeHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLXPostgresTypeDateTimeHandler.h; sourceTree = "<group>"; }; @@ -229,10 +229,10 @@ 1724CC8715FB4BF400AB2291 /* Domain */ = { isa = PBXGroup; children = ( - 1724CC9015FB4CC200AB2291 /* FLXTimeTZ.h */, - 1724CC9115FB4CC200AB2291 /* FLXTimeTZ.m */, - 1724CD5715FB8A3300AB2291 /* FLXTimeInterval.h */, - 1724CD5815FB8A3300AB2291 /* FLXTimeInterval.m */, + 1724CC9015FB4CC200AB2291 /* FLXPostgresTimeTZ.h */, + 1724CC9115FB4CC200AB2291 /* FLXPostgresTimeTZ.m */, + 1724CD5715FB8A3300AB2291 /* FLXPostgresTimeInterval.h */, + 1724CD5815FB8A3300AB2291 /* FLXPostgresTimeInterval.m */, ); name = Domain; sourceTree = "<group>"; @@ -400,8 +400,8 @@ 1731F02B15EE09E000D973EB /* FLXPostgresConnectionParameters.h in Headers */, 1731F10815F1A52B00D973EB /* FLXPostgresTypeDateTimeHandler.h in Headers */, 1731F52E15F48BA500D973EB /* FLXPostgresError.h in Headers */, - 1724CC9215FB4CC200AB2291 /* FLXTimeTZ.h in Headers */, - 1724CD5915FB8A3300AB2291 /* FLXTimeInterval.h in Headers */, + 1724CC9215FB4CC200AB2291 /* FLXPostgresTimeTZ.h in Headers */, + 1724CD5915FB8A3300AB2291 /* FLXPostgresTimeInterval.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -514,8 +514,8 @@ 1731F02C15EE09E000D973EB /* FLXPostgresConnectionParameters.m in Sources */, 1731F10915F1A52B00D973EB /* FLXPostgresTypeDateTimeHandler.m in Sources */, 1731F52F15F48BA500D973EB /* FLXPostgresError.m in Sources */, - 1724CC9315FB4CC200AB2291 /* FLXTimeTZ.m in Sources */, - 1724CD5A15FB8A3300AB2291 /* FLXTimeInterval.m in Sources */, + 1724CC9315FB4CC200AB2291 /* FLXPostgresTimeTZ.m in Sources */, + 1724CD5A15FB8A3300AB2291 /* FLXPostgresTimeInterval.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Frameworks/PostgresKit/Source/FLXPostgresKitPrivateAPI.h b/Frameworks/PostgresKit/Source/FLXPostgresKitPrivateAPI.h index 174b8018..d78ac063 100644 --- a/Frameworks/PostgresKit/Source/FLXPostgresKitPrivateAPI.h +++ b/Frameworks/PostgresKit/Source/FLXPostgresKitPrivateAPI.h @@ -21,7 +21,7 @@ // the License. #import "FLXPostgresConnection.h" -#import "FLXTimeInterval.h" +#import "FLXPostgresTimeInterval.h" @interface FLXPostgresConnection () @@ -35,7 +35,7 @@ @end -@interface FLXTimeInterval () +@interface FLXPostgresTimeInterval () - (id)initWithInterval:(const PGinterval *)interval; diff --git a/Frameworks/PostgresKit/Source/FLXTimeInterval.h b/Frameworks/PostgresKit/Source/FLXPostgresTimeInterval.h index 09fe4bf9..74f14c41 100644 --- a/Frameworks/PostgresKit/Source/FLXTimeInterval.h +++ b/Frameworks/PostgresKit/Source/FLXPostgresTimeInterval.h @@ -1,7 +1,7 @@ // // $Id$ // -// FLXTimeInterval.h +// FLXPostgresTimeInterval.h // PostgresKit // // Created by Stuart Connolly (stuconnolly.com) on September 9, 2012. @@ -29,13 +29,13 @@ // OTHER DEALINGS IN THE SOFTWARE. /** - * @class FLXTimeInterval FLXTimeInterval.h + * @class FLXPostgresTimeInterval FLXPostgresTimeInterval.h * * @author Stuart Connolly http://stuconnolly.com * * Simple wrapper around libpqtypes' PQinterval structure. */ -@interface FLXTimeInterval : NSObject +@interface FLXPostgresTimeInterval : NSObject { NSUInteger _microseconds; NSUInteger _seconds; diff --git a/Frameworks/PostgresKit/Source/FLXTimeInterval.m b/Frameworks/PostgresKit/Source/FLXPostgresTimeInterval.m index 48f8cbd4..7faaad41 100644 --- a/Frameworks/PostgresKit/Source/FLXTimeInterval.m +++ b/Frameworks/PostgresKit/Source/FLXPostgresTimeInterval.m @@ -1,7 +1,7 @@ // // $Id$ // -// FLXTimeInterval.m +// FLXPostgresTimeInterval.m // PostgresKit // // Created by Stuart Connolly (stuconnolly.com) on September 9, 2012. @@ -28,10 +28,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#import "FLXTimeInterval.h" +#import "FLXPostgresTimeInterval.h" #import "FLXPostgresKitPrivateAPI.h" -@implementation FLXTimeInterval +@implementation FLXPostgresTimeInterval @synthesize microseconds = _microseconds; @synthesize seconds = _seconds; diff --git a/Frameworks/PostgresKit/Source/FLXTimeTZ.h b/Frameworks/PostgresKit/Source/FLXPostgresTimeTZ.h index a24fc2cf..dd58f57f 100644 --- a/Frameworks/PostgresKit/Source/FLXTimeTZ.h +++ b/Frameworks/PostgresKit/Source/FLXPostgresTimeTZ.h @@ -1,7 +1,7 @@ // // $Id$ // -// FLXTimeTZ.h +// FLXPostgresTimeTZ.h // PostgresKit // // Created by Stuart Connolly (stuconnolly.com) on September 8, 2012. @@ -29,13 +29,13 @@ // OTHER DEALINGS IN THE SOFTWARE. /** - * @class FLXTimeTZ FLXTimeTZ.h + * @class FLXPostgresTimeTZ FLXPostgresTimeTZ.h * * @author Stuart Connolly http://stuconnolly.com * * Simple wrapper to represet a time or timestamp with an associated time zone. */ -@interface FLXTimeTZ : NSObject +@interface FLXPostgresTimeTZ : NSObject { BOOL _hasDate; @@ -55,7 +55,7 @@ */ @property (readonly) NSTimeZone *timeZone; -+ (FLXTimeTZ *)timeWithDate:(NSDate *)date timeZoneGMTOffset:(NSUInteger)offset; ++ (FLXPostgresTimeTZ *)timeWithDate:(NSDate *)date timeZoneGMTOffset:(NSUInteger)offset; - (id)initWithDate:(NSDate *)date timeZoneGMTOffset:(NSUInteger)offset; diff --git a/Frameworks/PostgresKit/Source/FLXTimeTZ.m b/Frameworks/PostgresKit/Source/FLXPostgresTimeTZ.m index 48c97aa9..692ef200 100644 --- a/Frameworks/PostgresKit/Source/FLXTimeTZ.m +++ b/Frameworks/PostgresKit/Source/FLXPostgresTimeTZ.m @@ -1,7 +1,7 @@ // // $Id$ // -// FLXTimeTZ.m +// FLXPostgresTimeTZ.m // PostgresKit // // Created by Stuart Connolly (stuconnolly.com) on September 8, 2012. @@ -28,9 +28,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#import "FLXTimeTZ.h" +#import "FLXPostgresTimeTZ.h" -@implementation FLXTimeTZ +@implementation FLXPostgresTimeTZ @synthesize hasDate = _hasDate; @synthesize date = _date; @@ -41,13 +41,13 @@ return [self initWithDate:[NSDate date] timeZoneGMTOffset:[[NSTimeZone systemTimeZone] secondsFromGMT]]; } -+ (FLXTimeTZ *)timeWithDate:(NSDate *)date timeZoneGMTOffset:(NSUInteger)offset ++ (FLXPostgresTimeTZ *)timeWithDate:(NSDate *)date timeZoneGMTOffset:(NSUInteger)offset { - return [[[FLXTimeTZ alloc] initWithDate:date timeZoneGMTOffset:offset] autorelease]; + return [[[FLXPostgresTimeTZ alloc] initWithDate:date timeZoneGMTOffset:offset] autorelease]; } /** - * Initialise a FLXTimeTZ with the supplied date and GMT offset. + * Initialise a FLXPostgresTimeTZ with the supplied date and GMT offset. * * @param date The date to use. * @param offset The GMT offset in seconds that the associated time zone is. diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m b/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m index c60c1eb9..b28868cc 100644 --- a/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m +++ b/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m @@ -25,7 +25,7 @@ #import "FLXPostgresConnectionParameters.h" #import "FLXPostgresConnection.h" #import "FLXPostgresConnectionTypeHandling.h" -#import "FLXTimeTZ.h" +#import "FLXPostgresTimeTZ.h" static FLXPostgresOid FLXPostgresTypeDateTimeTypes[] = { @@ -148,7 +148,7 @@ static FLXPostgresOid FLXPostgresTypeDateTimeTypes[] = NSDate *date = [self _dateFromComponents:components]; - return hasTimeZone ? [FLXTimeTZ timeWithDate:date timeZoneGMTOffset:time.gmtoff] : date; + return hasTimeZone ? [FLXPostgresTimeTZ timeWithDate:date timeZoneGMTOffset:time.gmtoff] : date; } /** @@ -169,11 +169,11 @@ static FLXPostgresOid FLXPostgresTypeDateTimeTypes[] = PQgetf(result, row, hasTimeZone ? "%timstamptz" : "%timestamp", column, ×tamp); - FLXTimeTZ *timestampTZ = nil; + FLXPostgresTimeTZ *timestampTZ = nil; NSDate *date = [NSDate dateWithTimeIntervalSince1970:timestamp.epoch]; if (hasTimeZone) { - timestampTZ = [FLXTimeTZ timeWithDate:date timeZoneGMTOffset:timestamp.time.gmtoff]; + timestampTZ = [FLXPostgresTimeTZ timeWithDate:date timeZoneGMTOffset:timestamp.time.gmtoff]; [timestampTZ setHasDate:YES]; } diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypes.h b/Frameworks/PostgresKit/Source/FLXPostgresTypes.h index 0f57daae..3216ad98 100644 --- a/Frameworks/PostgresKit/Source/FLXPostgresTypes.h +++ b/Frameworks/PostgresKit/Source/FLXPostgresTypes.h @@ -101,9 +101,9 @@ enum FLXPostgresOidDate = 1082, // DateHandler => NSDate FLXPostgresOidTime = 1083, // DateHandler => NSDate FLXPostgresOidTimestamp = 1114, // DateHandler => NSDate - FLXPostgresOidTimestampTZ = 1184, // DateHandler => FLXTimeTZ - FLXPostgresOidInterval = 1186, // DateHandler => FLXTimeInterval - FLXPostgresOidTimeTZ = 1266, // DateHandler => FLXTimeTZ + FLXPostgresOidTimestampTZ = 1184, // DateHandler => FLXPostgresTimeTZ + FLXPostgresOidInterval = 1186, // DateHandler => FLXPostgresTimeInterval + FLXPostgresOidTimeTZ = 1266, // DateHandler => FLXPostgresTimeTZ // Binary FLXPostgresOidBit = 1560, // Currently not supported |