[Pgsqlformac-commits] SF.net SVN: pgsqlformac: [195] trunk/PGSQLKit

[<haw...@us...>]

Revision: 195
          http://pgsqlformac.svn.sourceforge.net/pgsqlformac/?rev=195&view=rev
Author:   hawkmoon
Date:     2008-06-05 08:41:23 -0700 (Thu, 05 Jun 2008)

Log Message:
-----------
Altered globalConnection to allow for using ODBCKit and PGSQLKit in the same project.

Modified Paths:
--------------
    trunk/PGSQLKit/PGSQLConnection.h
    trunk/PGSQLKit/PGSQLConnection.m

Modified: trunk/PGSQLKit/PGSQLConnection.h
===================================================================
--- trunk/PGSQLKit/PGSQLConnection.h	2008-05-06 15:25:04 UTC (rev 194)
+++ trunk/PGSQLKit/PGSQLConnection.h	2008-06-05 15:41:23 UTC (rev 195)
@@ -34,6 +34,8 @@
 	NSString		*sslMode;	// allow, prefer, require
 	NSString		*service;	// service name
 	NSString		*krbsrvName;
+		
+	NSString		*commandStatus;
 }
 
 +(id)defaultConnection;
@@ -71,11 +73,12 @@
 
 -(NSMutableString *)sqlLog;
 -(void)appendSQLLog:(NSString *)value;
+	
+-(NSString *)lastCmdStatus;
 
-
 FOUNDATION_EXPORT NSString * const PGSQLConnectionDidCompleteNotification;
 FOUNDATION_EXPORT NSString * const PGSQLCommandDidCompleteNotification;	
 
 @end
 
-static PGSQLConnection *globalConnection;
+static PGSQLConnection *globalPGSQLConnection;

Modified: trunk/PGSQLKit/PGSQLConnection.m
===================================================================
--- trunk/PGSQLKit/PGSQLConnection.m	2008-05-06 15:25:04 UTC (rev 194)
+++ trunk/PGSQLKit/PGSQLConnection.m	2008-06-05 15:41:23 UTC (rev 195)
@@ -31,12 +31,12 @@
 
 +(id)defaultConnection
 {
-	if (globalConnection == nil)
+	if (globalPGSQLConnection == nil)
 	{
 		return nil;
 	}
 	
-	return globalConnection;
+	return globalPGSQLConnection;
 }
 
 #pragma mark Instance Methods
@@ -63,10 +63,12 @@
 		krbsrvName = nil;
 		connectionString = nil;
 		
-		if (globalConnection == nil)
+		commandStatus = nil;
+		
+		if (globalPGSQLConnection == nil)
 		{
 			[self retain];
-			globalConnection = self;
+			globalPGSQLConnection = self;
 		}
 	}
 	    
@@ -513,6 +515,7 @@
 - (NSString *)lastError {
     return errorDescription;
 }
+
 -(NSString *)lastCmdStatus {
 	return commandStatus;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.