[Mysql-cocoa-commits] CVS: SMySQL/MCPFoundationKit MCPConnection.m,1.5,1.6 MCPResult.m,1.5,1.6

[Serge C. <ser...@us...>]

Update of /cvsroot/mysql-cocoa/SMySQL/MCPFoundationKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27883/MCPFoundationKit

Modified Files:
	MCPConnection.m MCPResult.m 
Log Message:
Changed the version of the object (MCPConnection and MCPResult) to 2.3.1.
Corrected the -quoteObject method of the MCPConnection to take care of hte case where the object is either nil or an instance of NSNull.
2004-08-09; Serge Cohen.

Index: MCPConnection.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/MCPFoundationKit/MCPConnection.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MCPConnection.m	4 Aug 2004 23:24:06 -0000	1.5
--- MCPConnection.m	9 Aug 2004 16:04:25 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
  #import "MCPResult.h"
  #import "MCPNumber.h"
+ #import "MCPNull.h"
  
  const unsigned int	kMCPConnectionDefaultOption = CLIENT_COMPRESS;
***************
*** 123,131 ****
  + (void) initialize
  /*"
! Initialize the class version to 2.0.0
  "*/
  {
      if (self = [MCPConnection class]) {
!         [self setVersion:020300]; // Ma.Mi.Re -> MaMiRe
      }
  
--- 124,132 ----
  + (void) initialize
  /*"
! Initialize the class version to 2.3.1
  "*/
  {
      if (self = [MCPConnection class]) {
!         [self setVersion:020301]; // Ma.Mi.Re -> MaMiRe
      }
  
***************
*** 433,436 ****
--- 434,440 ----
     "*/
  {
+    if ((! theObject) || ([theObject isNSNull])) {
+       return @"NULL";
+    }
     if ([theObject isKindOfClass:[NSData class]]) {
        return [NSString stringWithFormat:@"'%@'", [self prepareBinaryData:(NSData *) theObject]];

Index: MCPResult.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/MCPFoundationKit/MCPResult.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MCPResult.m	4 Aug 2004 23:24:06 -0000	1.5
--- MCPResult.m	9 Aug 2004 16:04:25 -0000	1.6
***************
*** 68,76 ****
  + (void) initialize
  /*"
! Initialize the class version to 2.3.0
  "*/
  {
      if (self = [MCPResult class]) {
!         [self setVersion:020300]; // Ma.Mi.Re -> MaMiRe
          MCPYear0000 = [[NSCalendarDate dateWithTimeIntervalSinceReferenceDate:-63146822400.0] retain];
          [MCPYear0000 setCalendarFormat:@"%Y"];
--- 68,76 ----
  + (void) initialize
  /*"
! Initialize the class version to 2.3.1
  "*/
  {
      if (self = [MCPResult class]) {
!         [self setVersion:020301]; // Ma.Mi.Re -> MaMiRe
          MCPYear0000 = [[NSCalendarDate dateWithTimeIntervalSinceReferenceDate:-63146822400.0] retain];
          [MCPYear0000 setCalendarFormat:@"%Y"];