Menu
▾
▴
[Pgsqlformac-commits] pgCocoaDB ChangeLog, 1.22, 1.23 Connection.h, 1.9, 1.10 Connection.m, 1.17, 1.18 DataSource.h, 1.2, 1.3 DataSource.m, 1.3, 1.4 Database.h, 1.2, 1.3 Database.m, 1.2, 1.3 Databases.h, 1.2, 1.3 Databases.m, 1.4, 1.5 ExplorerModel.h, 1.7, 1.8 ExplorerModel.m, 1.16, 1.17 ExplorerNode.h, 1.5, 1.6 ExplorerNode.m, 1.7, 1.8 Field.h, 1.2, 1.3 Field.m, 1.5, 1.6 Fields.h, 1.3, 1.4 Fields.m, 1.6, 1.7 PGCocoaDB.h, 1.1, 1.2 Record.h, 1.3, 1.4 Record.m, 1.3, 1.4 RecordSet.h, 1.2, 1.3 RecordSet.m, 1.5, 1.6 Schema.h, 1.14, 1.15 Schema.m, 1.22, 1.23 Table.h, 1.2, 1.3 Table.m, 1.4, 1.5
Update of /cvsroot/pgsqlformac/pgCocoaDB In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv819 Modified Files: ChangeLog Connection.h Connection.m DataSource.h DataSource.m Database.h Database.m Databases.h Databases.m ExplorerModel.h ExplorerModel.m ExplorerNode.h ExplorerNode.m Field.h Field.m Fields.h Fields.m PGCocoaDB.h Record.h Record.m RecordSet.h RecordSet.m Schema.h Schema.m Table.h Table.m Log Message: Fix bug explorer not showing and PGCocoa.h being pulled into query tool. Index: Connection.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Connection.m,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Connection.m 4 Sep 2006 14:24:35 -0000 1.17 --- Connection.m 14 Sep 2006 12:26:46 -0000 1.18 *************** *** 7,13 **** // - #import "Connection.h" #include "libpq-fe.h" #import <sys/time.h> // When a pqlib notice is raised this function gets called --- 7,14 ---- // #include "libpq-fe.h" #import <sys/time.h> + #import "Connection.h" + #import "PGCocoaDB.h" // When a pqlib notice is raised this function gets called *************** *** 123,127 **** - (BOOL)connectUsingString:(NSString *)aConnectionString { ! [self setConnectionString:aConnectionString]; return [self connect]; } --- 124,129 ---- - (BOOL)connectUsingString:(NSString *)aConnectionString { ! [self setConnectionString:aConnectionString]; ! NSLog(@"Connection: connectUsingString: %@", aConnectionString); return [self connect]; } *************** *** 524,528 **** [field setName:[NSString stringWithFormat:@"%s", PQfname(res, x)]]; [field setValue:[NSString stringWithFormat:@"%s", PQgetvalue(res, i, x)]]; ! //[field setDataType:(int)PQftype(res, i)]; } } --- 526,530 ---- [field setName:[NSString stringWithFormat:@"%s", PQfname(res, x)]]; [field setValue:[NSString stringWithFormat:@"%s", PQgetvalue(res, i, x)]]; ! [field setFormat:[NSString stringWithFormat:@"%s", PQfformat(res, x)]]; } } Index: Connection.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Connection.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Connection.h 1 Sep 2006 00:53:35 -0000 1.9 --- Connection.h 14 Sep 2006 12:26:46 -0000 1.10 *************** *** 11,15 **** #import "Recordset.h" #import "Databases.h" - #import "PGCocoaDB.h" @interface Connection : NSObject --- 11,14 ---- Index: DataSource.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/DataSource.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DataSource.m 11 Aug 2006 18:01:25 -0000 1.3 --- DataSource.m 14 Sep 2006 12:26:46 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- #import <Cocoa/Cocoa.h> + #import "PGCocoaDB.h" #import "DataSource.h" Index: ExplorerModel.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/ExplorerModel.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ExplorerModel.h 4 Sep 2006 14:24:35 -0000 1.7 --- ExplorerModel.h 14 Sep 2006 12:26:46 -0000 1.8 *************** *** 12,18 **** #import "Connection.h" #import "Schema.h" - #import "PGCocoaDB.h" ! enum thread_status { None, Running, Done, Error }; @interface ExplorerModel : NSObject --- 12,17 ---- #import "Connection.h" #import "Schema.h" ! enum ThreadStatus { None, Running, Done, Error }; @interface ExplorerModel : NSObject *************** *** 29,33 **** NSLock *explorerThreadStatusLock; ! enum thread_status explorerThreadStatus; } --- 28,32 ---- NSLock *explorerThreadStatusLock; ! enum ThreadStatus explorerThreadStatus; } *************** *** 42,46 **** - (bool)showPGTemps; - (bool)showPublic; ! - (unsigned int)explorerThreadStatus; - (void)setShowInformationSchema:(bool)newValue; --- 41,45 ---- - (bool)showPGTemps; - (bool)showPublic; ! - (enum ThreadStatus)explorerThreadStatus; - (void)setShowInformationSchema:(bool)newValue; *************** *** 49,53 **** - (void)setShowPGTemps:(bool)newValue; - (void)setShowPublic:(bool)newValue; ! - (void)setExplorerThreadStatus:(unsigned int)newValue; // These methods get called because I am the datasource of the outline view. --- 48,52 ---- - (void)setShowPGTemps:(bool)newValue; - (void)setShowPublic:(bool)newValue; ! - (void)setExplorerThreadStatus:(enum ThreadStatus)newValue; // These methods get called because I am the datasource of the outline view. *************** *** 57,61 **** - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item; ! - (void)printLog; @end --- 56,60 ---- - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item; ! - (BOOL)printLog; @end Index: ExplorerModel.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/ExplorerModel.m,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ExplorerModel.m 4 Sep 2006 14:24:35 -0000 1.16 --- ExplorerModel.m 14 Sep 2006 12:26:46 -0000 1.17 *************** *** 7,10 **** --- 7,11 ---- // + #import "PGCocoaDB.h" #import "ExplorerModel.h" #import "RecordSet.h" *************** *** 315,321 **** connectionString = theConnection; ! explorerThreadStatusLock = [[NSLock alloc] init]; ! explorerThreadStatus = 0; showInformationSchema = TRUE; --- 316,324 ---- connectionString = theConnection; ! [connectionString retain]; ! NSLog(@"ExplorerModel: initWithConnectionString: theConnection"); ! explorerThreadStatusLock = [[NSLock alloc] init]; ! explorerThreadStatus = None; showInformationSchema = TRUE; *************** *** 517,523 **** } ! - (unsigned int)explorerThreadStatus { ! unsigned int status; [explorerThreadStatusLock lock]; --- 520,526 ---- } ! - (enum ThreadStatus)explorerThreadStatus { ! enum ThreadStatus status; [explorerThreadStatusLock lock]; *************** *** 552,556 **** } ! - (void)setExplorerThreadStatus:(unsigned int)newValue { [explorerThreadStatusLock lock]; --- 555,559 ---- } ! - (void)setExplorerThreadStatus:(enum ThreadStatus)newValue { [explorerThreadStatusLock lock]; *************** *** 568,572 **** return [rootNode childAtIndex:i]; } ! if([self explorerThreadStatus] != 3) { return 0; --- 571,575 ---- return [rootNode childAtIndex:i]; } ! if([self explorerThreadStatus] != Done) { return 0; *************** *** 581,585 **** // Returns YES if the node has children ! if([self explorerThreadStatus] != 3) { return NO; --- 584,588 ---- // Returns YES if the node has children ! if([self explorerThreadStatus] != Done) { return NO; *************** *** 597,601 **** return [rootNode childrenCount]; } ! if([self explorerThreadStatus] != 3) { return 0; --- 600,604 ---- return [rootNode childrenCount]; } ! if([self explorerThreadStatus] != Done) { return 0; *************** *** 633,643 **** } ! - (void)printLog { ! if([self explorerThreadStatus] == 3) { ! [rootNode printLog:0];; } NSLog(@"Explorer still Loading."); } --- 636,648 ---- } ! - (BOOL)printLog { ! if([self explorerThreadStatus] == Done) { ! [rootNode printLog:0]; ! return YES; } NSLog(@"Explorer still Loading."); + return NO; } Index: DataSource.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/DataSource.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DataSource.h 30 Aug 2006 15:48:49 -0000 1.2 --- DataSource.h 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 7,11 **** #import <Foundation/Foundation.h> - #import "PGCocoaDB.h" @interface DataSource : NSObject --- 7,10 ---- Index: RecordSet.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/RecordSet.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RecordSet.m 12 Aug 2006 16:38:16 -0000 1.5 --- RecordSet.m 14 Sep 2006 12:26:46 -0000 1.6 *************** *** 7,10 **** --- 7,11 ---- #import <Cocoa/Cocoa.h> + #import "PGCocoaDB.h" #import "RecordSet.h" Index: RecordSet.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/RecordSet.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RecordSet.h 30 Aug 2006 15:48:49 -0000 1.2 --- RecordSet.h 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 8,12 **** #import <Foundation/Foundation.h> #import "Record.h" - #import "PGCocoaDB.h" @interface RecordSet : NSObject --- 8,11 ---- Index: Fields.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Fields.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Fields.h 30 Aug 2006 15:48:49 -0000 1.3 --- Fields.h 14 Sep 2006 12:26:46 -0000 1.4 *************** *** 8,12 **** #import <Foundation/Foundation.h> #import "Field.h" - #import "PGCocoaDB.h" @interface Fields : NSObject --- 8,11 ---- Index: Database.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Database.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Database.h 30 Aug 2006 15:48:49 -0000 1.2 --- Database.h 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 8,12 **** #import <Foundation/Foundation.h> - #import "PGCocoaDB.h" @interface Database : NSObject --- 8,11 ---- Index: Fields.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Fields.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Fields.m 12 Aug 2006 16:38:16 -0000 1.6 --- Fields.m 14 Sep 2006 12:26:46 -0000 1.7 *************** *** 7,10 **** --- 7,11 ---- #import <Cocoa/Cocoa.h> + #import "PGCocoaDB.h" #import "Field.h" #import "Fields.h" Index: Database.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Database.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Database.m 11 Aug 2006 18:01:25 -0000 1.2 --- Database.m 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- // + #import "PGCocoaDB.h" #import "Database.h" Index: Record.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Record.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Record.h 30 Aug 2006 15:48:49 -0000 1.3 --- Record.h 14 Sep 2006 12:26:46 -0000 1.4 *************** *** 9,13 **** #import <Foundation/Foundation.h> #import "Fields.h" - #import "PGCocoaDB.h" @interface Record : NSObject --- 9,12 ---- Index: Schema.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Schema.m,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Schema.m 1 Sep 2006 00:53:35 -0000 1.22 --- Schema.m 14 Sep 2006 12:26:46 -0000 1.23 *************** *** 10,13 **** --- 10,14 ---- // + #import "PGCocoaDB.h" #import "Schema.h" *************** *** 26,29 **** --- 27,31 ---- connection = [[Connection alloc] init]; [connection connectUsingString:theConnectionString]; + NSLog(@"Schema: initWithConnectionString: %@", theConnectionString); publicSchemaName = [[NSString alloc] initWithString: @"public"]; Index: Schema.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Schema.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Schema.h 1 Sep 2006 00:53:35 -0000 1.14 --- Schema.h 14 Sep 2006 12:26:46 -0000 1.15 *************** *** 11,15 **** #import "Recordset.h" #import "Connection.h" - #import "PGCocoaDB.h" @interface Schema : NSObject { --- 11,14 ---- Index: PGCocoaDB.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/PGCocoaDB.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PGCocoaDB.h 30 Aug 2006 15:48:49 -0000 1.1 --- PGCocoaDB.h 14 Sep 2006 12:26:46 -0000 1.2 *************** *** 11,14 **** // To tell other that parpameters are purposesly not used and remove compiler warning. #define UNUSED_PARAMETER(x) (void)(x) ! // Global Project Definitions --- 11,14 ---- // To tell other that parpameters are purposesly not used and remove compiler warning. #define UNUSED_PARAMETER(x) (void)(x) ! // #define UNUSED_PARAMETER(x) // Global Project Definitions Index: Field.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Field.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Field.h 30 Aug 2006 15:48:49 -0000 1.2 --- Field.h 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 8,12 **** #import <Foundation/Foundation.h> - #import "PGCocoaDB.h" @interface Field : NSObject --- 8,11 ---- *************** *** 14,17 **** --- 13,17 ---- NSString *name; NSString *value; + NSString *format; } - (NSString *)name; *************** *** 21,23 **** --- 21,26 ---- - (void)setValue:(NSString *)newValue; + - (NSString *)format; + - (void)setFormat:(NSString *)newValue; + @end Index: Field.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Field.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Field.m 4 Sep 2006 14:24:35 -0000 1.5 --- Field.m 14 Sep 2006 12:26:46 -0000 1.6 *************** *** 7,10 **** --- 7,11 ---- // + #import "PGCocoaDB.h" #import "Field.h" *************** *** 60,63 **** --- 61,74 ---- } + - (NSString *)format + { + return format; + } + - (void)setFormat:(NSString *)newValue; + { + [format release]; + format = newValue; + [format retain]; + } @end Index: Table.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Table.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Table.h 30 Aug 2006 15:48:49 -0000 1.2 --- Table.h 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 8,12 **** #import <Foundation/Foundation.h> - #import "PGCocoaDB.h" @interface Table : NSObject --- 8,11 ---- Index: Record.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Record.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Record.m 11 Aug 2006 18:01:25 -0000 1.3 --- Record.m 14 Sep 2006 12:26:46 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- // + #import "PGCocoaDB.h" #import "Record.h" Index: ChangeLog =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ChangeLog 4 Sep 2006 14:34:28 -0000 1.22 --- ChangeLog 14 Sep 2006 12:26:46 -0000 1.23 *************** *** 1,2 **** --- 1,9 ---- + 2006-09-04 09:34 ntiffin + + * ChangeLog, pgCocoaDBn.xcodeproj/ntiffin.mode1, + pgCocoaDBn.xcodeproj/ntiffin.pbxuser, + pgCocoaDBn.xcodeproj/project.pbxproj: Add fink based XCode + project. + 2006-09-04 09:24 ntiffin Index: Table.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Table.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Table.m 12 Aug 2006 16:38:16 -0000 1.4 --- Table.m 14 Sep 2006 12:26:46 -0000 1.5 *************** *** 7,13 **** // #import "Table.h" - @implementation Table --- 7,13 ---- // + #import "PGCocoaDB.h" #import "Table.h" @implementation Table *************** *** 27,36 **** } ! - (NSString *)schema { return [[schema retain] autorelease]; } ! - (void)setSchema:(NSString *)newSchema { ! if (schema != newSchema) { [schema release]; schema = [newSchema copy]; --- 27,39 ---- } ! - (NSString *)schema ! { return [[schema retain] autorelease]; } ! - (void)setSchema:(NSString *)newSchema ! { ! if (schema != newSchema) ! { [schema release]; schema = [newSchema copy]; *************** *** 38,47 **** } ! - (NSString *)name { return [[name retain] autorelease]; } ! - (void)setName:(NSString *)newName { ! if (name != newName) { [name release]; name = [newName copy]; --- 41,53 ---- } ! - (NSString *)name ! { return [[name retain] autorelease]; } ! - (void)setName:(NSString *)newName ! { ! if (name != newName) ! { [name release]; name = [newName copy]; *************** *** 49,58 **** } ! - (NSString *)owner { return [[owner retain] autorelease]; } ! - (void)setOwner:(NSString *)newOwner { ! if (owner != newOwner) { [owner release]; owner = [newOwner copy]; --- 55,67 ---- } ! - (NSString *)owner ! { return [[owner retain] autorelease]; } ! - (void)setOwner:(NSString *)newOwner ! { ! if (owner != newOwner) ! { [owner release]; owner = [newOwner copy]; *************** *** 60,84 **** } ! - (BOOL)hasIndexes { return hasIndexes; } ! - (void)setHasIndexes:(BOOL)newHasIndexes { hasIndexes = newHasIndexes; } ! - (BOOL)hasRules { return hasRules; } ! - (void)setHasRules:(BOOL)newHasRules { hasRules = newHasRules; } ! - (BOOL)hasTriggers { return hasTriggers; } ! - (void)setHasTriggers:(BOOL)newHasTriggers { hasTriggers = newHasTriggers; } --- 69,99 ---- } ! - (BOOL)hasIndexes ! { return hasIndexes; } ! - (void)setHasIndexes:(BOOL)newHasIndexes ! { hasIndexes = newHasIndexes; } ! - (BOOL)hasRules ! { return hasRules; } ! - (void)setHasRules:(BOOL)newHasRules ! { hasRules = newHasRules; } ! - (BOOL)hasTriggers ! { return hasTriggers; } ! - (void)setHasTriggers:(BOOL)newHasTriggers ! { hasTriggers = newHasTriggers; } Index: ExplorerNode.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/ExplorerNode.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ExplorerNode.m 1 Sep 2006 00:53:35 -0000 1.7 --- ExplorerNode.m 14 Sep 2006 12:26:46 -0000 1.8 *************** *** 7,10 **** --- 7,11 ---- // + #import "PGCocoaDB.h" #import "ExplorerNode.h" Index: Databases.m =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Databases.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Databases.m 12 Aug 2006 16:38:16 -0000 1.4 --- Databases.m 14 Sep 2006 12:26:46 -0000 1.5 *************** *** 7,10 **** --- 7,11 ---- #import <Cocoa/Cocoa.h> + #import "PGCocoaDB.h" #import "Database.h" #import "Databases.h" Index: ExplorerNode.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/ExplorerNode.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExplorerNode.h 1 Sep 2006 00:53:35 -0000 1.5 --- ExplorerNode.h 14 Sep 2006 12:26:46 -0000 1.6 *************** *** 8,12 **** #import <Cocoa/Cocoa.h> - #import "PGCocoaDB.h" @interface ExplorerNode : NSObject { --- 8,11 ---- Index: Databases.h =================================================================== RCS file: /cvsroot/pgsqlformac/pgCocoaDB/Databases.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Databases.h 30 Aug 2006 15:48:49 -0000 1.2 --- Databases.h 14 Sep 2006 12:26:46 -0000 1.3 *************** *** 8,12 **** #import <Foundation/Foundation.h> #import "Database.h" - #import "PGCocoaDB.h" @interface Databases : NSObject --- 8,11 ---- |
