mysql-cocoa-commits Mailing List for MySQL Objective C API for Cocoa (Page 7)
Brought to you by:
sergecohen
Menu
▾
▴
mysql-cocoa-commits
You can subscribe to this list here.
| 2002 |
Jan
(2) |
Feb
(6) |
Mar
(11) |
Apr
(2) |
May
(40) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
(4) |
Dec
(11) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(44) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
(4) |
Jun
|
Jul
|
Aug
(12) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Serge C. <ser...@us...> - 2002-05-07 17:25:54
|
Update of /cvsroot/mysql-cocoa/MySQL_Display/English.lproj/SMySQLTableWindow.nib In directory usw-pr-cvs1:/tmp/cvs-serv15505/SMySQLTableWindow.nib Modified Files: info.nib objects.nib Log Message: Take care of the update of the DB. Still should bug if the columns (name or number) changed from last doQuery. Abnormal behaviour when linked with the fully_embeded version of the SMySQL framework. Maybe a problem of version of the includes... Serge Cohen; MySQL Cocoa project, May 7th 2002. Index: info.nib =================================================================== RCS file: /cvsroot/mysql-cocoa/MySQL_Display/English.lproj/SMySQLTableWindow.nib/info.nib,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** info.nib 22 Jan 2002 19:28:34 -0000 1.1.1.1 --- info.nib 7 May 2002 17:25:51 -0000 1.2 *************** *** 9,17 **** <key>IBOpenObjects</key> <array> - <integer>5</integer> <integer>40</integer> </array> <key>IBSystem Version</key> ! <string>5P48</string> </dict> </plist> --- 9,16 ---- <key>IBOpenObjects</key> <array> <integer>40</integer> </array> <key>IBSystem Version</key> ! <string>5Q45</string> </dict> </plist> Index: objects.nib =================================================================== RCS file: /cvsroot/mysql-cocoa/MySQL_Display/English.lproj/SMySQLTableWindow.nib/objects.nib,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsDnk9eb and /tmp/cvsClAFfc differ |
|
From: Serge C. <ser...@us...> - 2002-05-07 17:22:35
|
Update of /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv12772
Modified Files:
project.pbxproj cohen.pbxuser
Log Message:
Added a default to types switches... An error occured otherwise. Big bug on the fully embedded version of the framework. The other two versions work perfectly.
Added function to get info on proto/client/host informations.
Serge Cohen; MySQL Cocoa project, 7th May 2002....
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/project.pbxproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** project.pbxproj 6 May 2002 09:58:27 -0000 1.9
--- project.pbxproj 7 May 2002 17:22:32 -0000 1.10
***************
*** 802,806 ****
);
isa = PBXGroup;
! name = "v 3.23.49";
refType = 4;
};
--- 802,806 ----
);
isa = PBXGroup;
! name = /usr/local/include/mysql;
refType = 4;
[...980 lines suppressed...]
};
F5649EB7023FD60301D04C4B = {
isa = PBXFileReference;
name = thr_mutex.c;
! path = mysqlclient_source/thr_mutex.c;
! refType = 2;
};
F5649EB8023FD60301D04C4B = {
isa = PBXFileReference;
name = typelib.c;
! path = mysqlclient_source/typelib.c;
! refType = 2;
};
F5649EB9023FD60301D04C4B = {
isa = PBXFileReference;
name = violite.c;
! path = mysqlclient_source/violite.c;
! refType = 2;
};
F5649EBC023FD60301D04C4B = {
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/cohen.pbxuser,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cohen.pbxuser 6 May 2002 09:58:27 -0000 1.10
--- cohen.pbxuser 7 May 2002 17:22:33 -0000 1.11
***************
*** 16,23 ****
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
! ActiveTab = 2;
Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 216}, {719, 408}}";
};
SplitCount = 1;
--- 16,23 ----
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
! ActiveTab = 3;
Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 319}, {719, 305}}";
};
SplitCount = 1;
|
|
From: Serge C. <ser...@us...> - 2002-05-07 17:22:25
|
Update of /cvsroot/mysql-cocoa/SMySQL
In directory usw-pr-cvs1:/tmp/cvs-serv12656
Modified Files:
SMySQLConnection.h SMySQLConnection.m SMySQLResult.m
Log Message:
Added a default to types switches... An error occured otherwise. Big bug on the fully embedded version of the framework. The other two versions work perfectly.
Added function to get info on proto/client/host informations.
Serge Cohen; MySQL Cocoa project, 7th May 2002.
Index: SMySQLConnection.h
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SMySQLConnection.h 6 May 2002 09:58:27 -0000 1.6
--- SMySQLConnection.h 7 May 2002 17:22:21 -0000 1.7
***************
*** 96,100 ****
--- 96,103 ----
"*/
+ - (NSString *)clientInfo;
+ - (NSString *)hostInfo;
- (NSString *)serverInfo;
+ - (NSNumber *)protoInfo;
//- (BOOL)createDBWithName:(NSString *)dbName;
Index: SMySQLConnection.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SMySQLConnection.m 6 May 2002 09:58:27 -0000 1.6
--- SMySQLConnection.m 7 May 2002 17:22:21 -0000 1.7
***************
*** 396,400 ****
if ((theQueryCode = mysql_query(mConnection, theCQuery)) == NULL) {
! theResult = [theResult initWithMySQLPtr:mConnection encoding:mEncoding];
}
else {
--- 396,406 ----
if ((theQueryCode = mysql_query(mConnection, theCQuery)) == NULL) {
! if (mysql_field_count(mConnection) != 0) {
! theResult = [theResult initWithMySQLPtr:mConnection encoding:mEncoding];
! }
! else {
! NSLog (@"Query worked but gives no output\n");
! [theResult init];
! }
}
else {
***************
*** 517,520 ****
--- 523,544 ----
+ - (NSString *)clientInfo
+ /*"
+ Return a string giving the client library version
+ "*/
+ {
+ return [self stringWithCString:mysql_get_client_info()];
+ }
+
+
+ - (NSString *)hostInfo
+ /*"
+ Return a string giving information on the host of the DB server.
+ "*/
+ {
+ return [self stringWithCString:mysql_get_host_info(mConnection)];
+ }
+
+
- (NSString *)serverInfo
/*"
***************
*** 529,532 ****
--- 553,565 ----
+ - (NSNumber *)protoInfo
+ /*"
+ Return the number of the protocole used to transfer info from server to client
+ "*/
+ {
+ return [NSNumber numberWithUnsignedInt:mysql_get_proto_info(mConnection)];
+ }
+
+
/*
- (BOOL)createDBWithName:(NSString *)dbName
***************
*** 592,598 ****
"*/
{
! NSData * theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
! NSString * theString = [[NSString alloc] initWithData:theData encoding:mEncoding];
if (theString) {
[theString autorelease];
--- 625,636 ----
"*/
{
! NSData * theData;
! NSString * theString;
+ if (theCString == NULL) {
+ return @"";
+ }
+ theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
+ theString = [[NSString alloc] initWithData:theData encoding:mEncoding];
if (theString) {
[theString autorelease];
Index: SMySQLResult.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLResult.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SMySQLResult.m 6 May 2002 09:58:27 -0000 1.4
--- SMySQLResult.m 7 May 2002 17:22:21 -0000 1.5
***************
*** 215,218 ****
--- 215,220 ----
theData[theLengths[i]] = '\0';
+ // NSLog (@"in fetchRowAsDictionary : field type is %d, for column %d", (int)theField[i].type, (int)i);
+
switch (theField[i].type) {
case FIELD_TYPE_TINY:
***************
*** 277,280 ****
--- 279,286 ----
[theCurrentObj autorelease];
break;
+ default:
+ NSLog (@"in fetchRowAsDictionary : Unknown type : %d for column %d, send back a NSData object", (int)theField[i].type, (int)i);
+ theCurrentObj = [NSData dataWithBytes:theData length:theLengths[i]];
+ break;
}
[theDict setObject:theCurrentObj forKey:[mNames objectAtIndex:i]];
***************
*** 320,323 ****
--- 326,332 ----
theData[theLengths[i]] = '\0';
+ // NSLog (@"in fetchRowAsArray : field type is %d, for column %d", (int)theField[i].type, (int)i);
+
+
switch (theField[i].type) {
case FIELD_TYPE_TINY:
***************
*** 382,385 ****
--- 391,398 ----
[theCurrentObj autorelease];
break;
+ default:
+ NSLog (@"in fetchRowAsArray : Unknown type : %d for column %d, send back a NSData object", (int)theField[i].type, (int)i);
+ theCurrentObj = [NSData dataWithBytes:theData length:theLengths[i]];
+ break;
}
[theArray addObject:theCurrentObj];
***************
*** 407,411 ****
if (mResult == NULL) {
// If no results, give an empty array. Maybe it's better to give a nil pointer?
! return (mNames = [NSArray array]);
}
--- 420,424 ----
if (mResult == NULL) {
// If no results, give an empty array. Maybe it's better to give a nil pointer?
! return (mNames = [[NSArray array] retain]);
}
***************
*** 415,419 ****
for (i=0; i<theNumFields; i++) {
NSString *theName = [self stringWithCString:theField[i].name];
! [theNamesArray addObject:theName];
}
--- 428,437 ----
for (i=0; i<theNumFields; i++) {
NSString *theName = [self stringWithCString:theField[i].name];
! if ((theName) && (![theName isEqualToString:@""])) {
! [theNamesArray addObject:theName];
! }
! else {
! [theNamesArray addObject:[NSString stringWithFormat:@"Column %d", i]];
! }
}
***************
*** 511,514 ****
--- 529,536 ----
theType = @"newdate";
break;
+ default:
+ theType = @"unknown";
+ NSLog (@"in fetchTypesAsArray : Unknown type for column %d of the SMySQLResult, type = %d", (int)i, (int)theField[i].type);
+ break;
}
[theTypesArray addObject:theType];
***************
*** 613,616 ****
--- 635,642 ----
theType = @"newdate";
break;
+ default:
+ theType = @"unknown";
+ NSLog (@"in fetchTypesAsDictionary : Unknown type for column %d of the SMySQLResult, type = %d", (int)i, (int)theField[i].type);
+ break;
}
[theTypesDict setObject:theType forKey:[mNames objectAtIndex:i]];
***************
*** 703,707 ****
- (NSString *)description
/*"
! Return a (long) string containing the table of results, first line being the fields name, next line(s) the row(s). Useful to have NSLog a SMySQLResult (example).
"*/
{
--- 729,733 ----
- (NSString *)description
/*"
! Return a (long) string containing the table of results, first line being the fields name, next line(s) the row(s). Useful to have NSLog logging a SMySQLResult (example).
"*/
{
***************
*** 776,782 ****
"*/
{
! NSData * theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
! NSString * theString = [[NSString alloc] initWithData:theData encoding:mEncoding];
if (theString) {
[theString autorelease];
--- 802,813 ----
"*/
{
! NSData * theData;
! NSString * theString;
+ if (theCString == NULL) {
+ return @"";
+ }
+ theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
+ theString = [[NSString alloc] initWithData:theData encoding:mEncoding];
if (theString) {
[theString autorelease];
|
|
From: Serge C. <ser...@us...> - 2002-05-06 10:04:32
|
Update of /cvsroot/mysql-cocoa/SMySQL_test/SMySQL_test.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv14000/SMySQL_test.pbproj
Modified Files:
cohen.pbxuser
Log Message:
Test the new methods of SMySQLConnection and the -description method of SMySQLResult (through NSLog).
Serge Cohen; MySQL Cocoa project, May 6th 2002.
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL_test/SMySQL_test.pbproj/cohen.pbxuser,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cohen.pbxuser 3 May 2002 09:38:43 -0000 1.2
--- cohen.pbxuser 6 May 2002 10:04:29 -0000 1.3
***************
*** 14,32 ****
Frame = "{{0, 23}, {946, 508}}";
Split0 = {
! Frame = "{{224, 0}, {722, 508}}";
Split0 = {
! Frame = "{{0, 24}, {722, 484}}";
};
SplitCount = 1;
Tab0 = {
Debugger = {
! Frame = "{{0, 0}, {484, 208}}";
Split0 = {
! Frame = "{{0, 25}, {484, 183}}";
Split0 = {
! Frame = "{{0, 0}, {236, 183}}";
};
Split1 = {
! Frame = "{{245, 0}, {239, 183}}";
};
SplitCount = 2;
--- 14,32 ----
Frame = "{{0, 23}, {946, 508}}";
Split0 = {
! Frame = "{{257, 0}, {689, 508}}";
Split0 = {
! Frame = "{{0, 24}, {689, 484}}";
};
SplitCount = 1;
Tab0 = {
Debugger = {
! Frame = "{{0, 0}, {689, 208}}";
Split0 = {
! Frame = "{{0, 24}, {689, 184}}";
Split0 = {
! Frame = "{{0, 0}, {337, 184}}";
};
Split1 = {
! Frame = "{{346, 0}, {343, 184}}";
};
SplitCount = 2;
***************
*** 41,58 ****
TabCount = 2;
};
! Frame = "{{0, 0}, {484, 208}}";
LauncherConfigVersion = 4;
};
Tab1 = {
! Frame = "{{0, 0}, {722, 208}}";
LauncherConfigVersion = 3;
Runner = {
! Frame = "{{0, 0}, {722, 208}}";
};
};
Tab2 = {
! BuildMessageFrame = "{{0, 0}, {724, 87}}";
! BuildTranscriptFrame = "{{0, 96}, {724, 34}}";
! Frame = "{{0, 0}, {722, 128}}";
};
Tab3 = {
--- 41,58 ----
TabCount = 2;
};
! Frame = "{{0, 0}, {689, 208}}";
LauncherConfigVersion = 4;
};
Tab1 = {
! Frame = "{{0, 0}, {689, 208}}";
LauncherConfigVersion = 3;
Runner = {
! Frame = "{{0, 0}, {689, 208}}";
};
};
Tab2 = {
! BuildMessageFrame = "{{0, 0}, {691, 87}}";
! BuildTranscriptFrame = "{{0, 96}, {691, 34}}";
! Frame = "{{0, 0}, {689, 128}}";
};
Tab3 = {
***************
*** 63,67 ****
SplitCount = 1;
Tab0 = {
! Frame = "{{0, 0}, {200, 508}}";
};
Tab1 = {
--- 63,67 ----
SplitCount = 1;
Tab0 = {
! Frame = "{{0, 0}, {233, 508}}";
};
Tab1 = {
|
|
From: Serge C. <ser...@us...> - 2002-05-06 10:04:32
|
Update of /cvsroot/mysql-cocoa/SMySQL_test
In directory usw-pr-cvs1:/tmp/cvs-serv14000
Modified Files:
main2.m
Log Message:
Test the new methods of SMySQLConnection and the -description method of SMySQLResult (through NSLog).
Serge Cohen; MySQL Cocoa project, May 6th 2002.
Index: main2.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL_test/main2.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main2.m 3 May 2002 09:38:36 -0000 1.3
--- main2.m 6 May 2002 10:04:29 -0000 1.4
***************
*** 65,70 ****
// [result release];
! // result = [connection listFields:nil forTable:@"test1"];
! // NSLog (@"Here is theNSLog of a SMySQLResult (listFields:nil forTable:test1) %@", result);
result = [connection listDBs:nil];
--- 65,73 ----
// [result release];
! result = [connection queryString:@"select test1_id, test1_key from test1 where id=1"];
! NSLog (@"Here is theNSLog of a SMySQLResult %@", result);
!
! result = [connection listFields:nil forTable:@"test1"];
! NSLog (@"Here is theNSLog of a SMySQLResult (listFields:nil forTable:test1) %@", result);
result = [connection listDBs:nil];
***************
*** 77,80 ****
--- 80,89 ----
NSLog (@"Here is the NSLog of a SMySQLResult (listTables) : \n%@", result);
+ NSLog (@"Here comes the server information : %@\n", [connection serverInfo]);
+
+ [connection queryString:@"select blablabla error"];
+ NSLog (@"Here comes the last error information : %@\n", [connection getLastErrorMessage]);
+
+ [connection release];
[pool release];
return 0;
|
|
From: Serge C. <ser...@us...> - 2002-05-06 09:58:31
|
Update of /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv11778/SMySQL.pbproj
Modified Files:
cohen.pbxuser project.pbxproj
Log Message:
Corrected the method listFields: fromTable:.
Finished the proper character set encoding for all the method. This version should be as transaprent as possible with non ascii character encoding (as far as the charset used by mysql is known from Mac OS X).
Incremented the version to 0.5.5
Serge Cohen; MySQL Cocoa project, May 6th 2002.
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/cohen.pbxuser,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cohen.pbxuser 3 May 2002 09:36:47 -0000 1.9
--- cohen.pbxuser 6 May 2002 09:58:27 -0000 1.10
***************
*** 16,22 ****
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 24}, {719, 600}}";
};
SplitCount = 1;
--- 16,23 ----
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
+ ActiveTab = 2;
Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 216}, {719, 408}}";
};
SplitCount = 1;
***************
*** 59,63 ****
};
Tab3 = {
! Frame = "{{0, 0}, {747, 295}}";
};
TabCount = 4;
--- 60,64 ----
};
Tab3 = {
! Frame = "{{0, 0}, {719, 295}}";
};
TabCount = 4;
***************
*** 102,105 ****
--- 103,111 ----
uiCtxt = {
sepNavWindowFrame = "{{38, 218}, {750, 502}}";
+ };
+ };
+ F5165EB801C50A5A0116CAC1 = {
+ uiCtxt = {
+ sepNavWindowFrame = "{{15, 239}, {750, 502}}";
};
};
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/project.pbxproj,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** project.pbxproj 3 May 2002 09:36:47 -0000 1.8
--- project.pbxproj 6 May 2002 09:58:27 -0000 1.9
***************
*** 116,120 ****
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.4;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_VERSION = A;
--- 116,120 ----
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.5;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_VERSION = A;
***************
*** 161,165 ****
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.4d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
--- 161,165 ----
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.5d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
***************
*** 410,414 ****
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.4;
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = mysqlclient_source/headers;
--- 410,414 ----
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.5;
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = mysqlclient_source/headers;
***************
*** 452,456 ****
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.4d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
--- 452,456 ----
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.5d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
***************
*** 1849,1853 ****
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.4;
FRAMEWORK_VERSION = A;
LIBRARY_SEARCH_PATHS = /usr/local/lib/mysql;
--- 1849,1853 ----
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.5;
FRAMEWORK_VERSION = A;
LIBRARY_SEARCH_PATHS = /usr/local/lib/mysql;
***************
*** 1895,1899 ****
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.4d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
--- 1895,1899 ----
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.5d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
|
|
From: Serge C. <ser...@us...> - 2002-05-06 09:58:31
|
Update of /cvsroot/mysql-cocoa/SMySQL
In directory usw-pr-cvs1:/tmp/cvs-serv11778
Modified Files:
SMySQLConnection.h SMySQLConnection.m SMySQLResult.h
SMySQLResult.m
Log Message:
Corrected the method listFields: fromTable:.
Finished the proper character set encoding for all the method. This version should be as transaprent as possible with non ascii character encoding (as far as the charset used by mysql is known from Mac OS X).
Incremented the version to 0.5.5
Serge Cohen; MySQL Cocoa project, May 6th 2002.
Index: SMySQLConnection.h
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SMySQLConnection.h 3 May 2002 09:36:39 -0000 1.5
--- SMySQLConnection.h 6 May 2002 09:58:27 -0000 1.6
***************
*** 112,115 ****
--- 112,116 ----
"*/
- (const char *)cStringFromString:(NSString *)theString;
+ - (NSString *)stringWithCString:(const char *)theCString;
@end
Index: SMySQLConnection.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SMySQLConnection.m 3 May 2002 09:36:39 -0000 1.5
--- SMySQLConnection.m 6 May 2002 09:58:27 -0000 1.6
***************
*** 215,218 ****
--- 215,219 ----
/*"
Select the encoding used by the server for data transfert. This is usefull for the output NSString (query result) to be Ok even for character which are not ASCII
+ NB: The character set (encoding) used by the db is passed to the SMySQLConnection object upon connection, so most likely the encoding (from -encoding) method is already the proper one. That is to say : It's unlikeley you need to use this method, and if ever you use it, do it at your own risks.
"*/
{
***************
*** 247,251 ****
{
#warning What to do if one of the string is a nil pointer?
- #warning What about the encoding?
const char *theHost = [host UTF8String];
const char *theLogin = [login UTF8String];
--- 248,251 ----
***************
*** 284,288 ****
{
#warning What to do if one of the string is a nil pointer?
- #warning What about the encoding?
const char *theSocket = [socket UTF8String];
const char *theLogin = [login UTF8String];
--- 284,287 ----
***************
*** 320,325 ****
}
if (mConnected) {
! #warning What about the encoding?
! const char *theDBName = [dbName UTF8String];
if (mysql_select_db(mConnection, theDBName) == NULL) {
return YES;
--- 319,323 ----
}
if (mConnected) {
! const char *theDBName = [self cStringFromString:dbName];
if (mysql_select_db(mConnection, theDBName) == NULL) {
return YES;
***************
*** 336,341 ****
{
if (mConnection) {
! #warning What about the encoding?
! return [NSString stringWithUTF8String:mysql_error(mConnection)];
}
else {
--- 334,338 ----
{
if (mConnection) {
! return [self stringWithCString:mysql_error(mConnection)];
}
else {
***************
*** 383,390 ****
mysql_real_escape_string(mConnection, theCEscBuffer, theCDataBuffer, theLength);
! #warning What about the encoding?
! theReturn = [NSString stringWithUTF8String:theCEscBuffer];
free (theCEscBuffer);
- [theReturn autorelease];
return theReturn;
}
--- 380,385 ----
mysql_real_escape_string(mConnection, theCEscBuffer, theCDataBuffer, theLength);
! theReturn = [self stringWithCString:theCEscBuffer];
free (theCEscBuffer);
return theReturn;
}
***************
*** 397,420 ****
{
SMySQLResult *theResult = [SMySQLResult alloc];
- #warning We should get a proper encoding for the string (more likely iso latin-1) (done?)
const char *theCQuery = [self cStringFromString:query];
int theQueryCode;
- NSLog (@"in queryString query is : %s -in ObjC : %@-\n", theCQuery, query);
if ((theQueryCode = mysql_query(mConnection, theCQuery)) == NULL) {
theResult = [theResult initWithMySQLPtr:mConnection encoding:mEncoding];
- NSLog (@"the SMySQLResult is %@\n", theResult);
- if (theResult) {
- [theResult autorelease];
- }
- return theResult;
}
else {
NSLog (@"Problem in queryString error code is : %d, query is : %s -in ObjC : %@-\n", theQueryCode, theCQuery, query);
}
if (theResult) {
! [theResult release];
}
! return nil;
}
--- 392,409 ----
{
SMySQLResult *theResult = [SMySQLResult alloc];
const char *theCQuery = [self cStringFromString:query];
int theQueryCode;
if ((theQueryCode = mysql_query(mConnection, theCQuery)) == NULL) {
theResult = [theResult initWithMySQLPtr:mConnection encoding:mEncoding];
}
else {
NSLog (@"Problem in queryString error code is : %d, query is : %s -in ObjC : %@-\n", theQueryCode, theCQuery, query);
+ theResult = [theResult init];
}
if (theResult) {
! [theResult autorelease];
}
! return theResult;
}
***************
*** 524,530 ****
theResult = [self queryString:theQuery];
}
- if (theResult) {
- [theResult autorelease];
- }
return theResult;
}
--- 513,516 ----
***************
*** 537,544 ****
{
if (mConnected) {
! #warning Is the string is really encoded in UTF8 : NO, in iso latin1
! return [NSString stringWithUTF8String: mysql_get_server_info(mConnection)];
}
! return [NSString stringWithUTF8String: ""];
}
--- 523,529 ----
{
if (mConnected) {
! return [self stringWithCString: mysql_get_server_info(mConnection)];
}
! return @"";
}
***************
*** 595,603 ****
"*/
{
! NSMutableData *theData = [NSMutableData dataWithCapacity:0];
! [theData appendData:[theString dataUsingEncoding: mEncoding allowLossyConversion: YES]];
[theData increaseLengthBy:1];
return (const char *)[theData bytes];
}
--- 580,602 ----
"*/
{
! NSMutableData *theData = [NSMutableData dataWithData:[theString dataUsingEncoding:mEncoding allowLossyConversion:YES]];
[theData increaseLengthBy:1];
return (const char *)[theData bytes];
+ }
+
+
+ - (NSString *)stringWithCString:(const char *)theCString
+ /*"
+ Return a NSString from a C style string encoded with the character set of theSMySQLConnection.
+ "*/
+ {
+ NSData * theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
+ NSString * theString = [[NSString alloc] initWithData:theData encoding:mEncoding];
+
+ if (theString) {
+ [theString autorelease];
+ }
+ return theString;
}
Index: SMySQLResult.h
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLResult.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMySQLResult.h 3 May 2002 09:36:39 -0000 1.3
--- SMySQLResult.h 6 May 2002 09:58:27 -0000 1.4
***************
*** 83,86 ****
--- 83,91 ----
- (void)dealloc;
+ /*"
+ Private methods, internam use only
+ "*/
+ - (const char *)cStringFromString:(NSString *)theString;
+ - (NSString *)stringWithCString:(const char *)theCString;
@end
Index: SMySQLResult.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLResult.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMySQLResult.m 3 May 2002 09:36:39 -0000 1.3
--- SMySQLResult.m 6 May 2002 09:58:27 -0000 1.4
***************
*** 75,78 ****
--- 75,84 ----
}
mResult = mysql_store_result(mySQLPtr);
+ /*
+ if (mResult == NULL) {
+ [self autorelease];
+ return nil;
+ }
+ */
if (mMySQLLocales == NULL) {
mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
***************
*** 100,107 ****
}
mResult = mySQLResPtr;
! if (mResult == NULL) {
[self autorelease];
return nil;
}
if (mMySQLLocales == NULL) {
mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
--- 106,115 ----
}
mResult = mySQLResPtr;
! /*
! if (mResult == NULL) {
[self autorelease];
return nil;
}
+ */
if (mMySQLLocales == NULL) {
mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
***************
*** 224,228 ****
// a switch on theLength[i] would do that...
// Here it will crash if it's not default presentation : TIMESTAMP(14)
- #warning What about the encoding? For all the rest of the method
theCurrentObj = [NSCalendarDate dateWithString:[NSString stringWithUTF8String:theData] calendarFormat:@"%Y%m%d%H%M%S"];
break;
--- 232,235 ----
***************
*** 266,270 ****
case FIELD_TYPE_NEWDATE:
// Don't know what the format for this type is...
! theCurrentObj = [NSString stringWithUTF8String:theData];
break;
}
--- 273,279 ----
case FIELD_TYPE_NEWDATE:
// Don't know what the format for this type is...
! theDataObj = [NSData dataWithBytes:theData length:theLengths[i]];
! theCurrentObj = [[NSString alloc] initWithData:theDataObj encoding:mEncoding];
! [theCurrentObj autorelease];
break;
}
***************
*** 328,332 ****
// a switch on theLength[i] would do that...
// Here it will crash if it's not default presentation : TIMESTAMP(14)
- #warning What about the encoding? For all the rest of the method
theCurrentObj = [NSCalendarDate dateWithString:[NSString stringWithUTF8String:theData] calendarFormat:@"%Y%m%d%H%M%S"];
break;
--- 337,340 ----
***************
*** 370,374 ****
case FIELD_TYPE_NEWDATE:
// Don't know what the format for this type is...
! theCurrentObj = [NSString stringWithUTF8String:theData];
break;
}
--- 378,384 ----
case FIELD_TYPE_NEWDATE:
// Don't know what the format for this type is...
! theDataObj = [NSData dataWithBytes:theData length:theLengths[i]];
! theCurrentObj = [[NSString alloc] initWithData:theDataObj encoding:mEncoding];
! [theCurrentObj autorelease];
break;
}
***************
*** 404,409 ****
theField = mysql_fetch_fields(mResult);
for (i=0; i<theNumFields; i++) {
! #warning What about the encoding? For all the rest of the method
! NSString *theName = [NSString stringWithUTF8String:theField[i].name];
[theNamesArray addObject:theName];
}
--- 414,418 ----
theField = mysql_fetch_fields(mResult);
for (i=0; i<theNumFields; i++) {
! NSString *theName = [self stringWithCString:theField[i].name];
[theNamesArray addObject:theName];
}
***************
*** 747,750 ****
--- 756,786 ----
[super dealloc];
return;
+ }
+
+ - (const char *)cStringFromString:(NSString *)theString
+ /*"
+ For internal use only. Transform a NSString to a C type string (ended with \0) using ethe character set from the SMySQLConnection.
+ Lossy conversions are enabled.
+ "*/
+ {
+ NSMutableData *theData = [NSMutableData dataWithData:[theString dataUsingEncoding:mEncoding allowLossyConversion:YES]];
+
+ [theData increaseLengthBy:1];
+ return (const char *)[theData bytes];
+ }
+
+
+ - (NSString *)stringWithCString:(const char *)theCString
+ /*"
+ Return a NSString from a C style string encoded with the character set of theSMySQLConnection.
+ "*/
+ {
+ NSData * theData = [NSData dataWithBytes:theCString length:(strlen(theCString))];
+ NSString * theString = [[NSString alloc] initWithData:theData encoding:mEncoding];
+
+ if (theString) {
+ [theString autorelease];
+ }
+ return theString;
}
|
|
From: Serge C. <ser...@us...> - 2002-05-03 09:57:59
|
Update of /cvsroot/mysql-cocoa/Documentation/website In directory usw-pr-cvs1:/tmp/cvs-serv8750 Modified Files: index.html Log Message: Added an entry for the new SMySQL framework (0.5.4). Serge Cohen; MySQL Cocoa project, May 3rd 2002. Index: index.html =================================================================== RCS file: /cvsroot/mysql-cocoa/Documentation/website/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index.html 14 Mar 2002 09:59:44 -0000 1.10 --- index.html 3 May 2002 09:57:56 -0000 1.11 *************** *** 23,26 **** --- 23,27 ---- <!--Updates--> + <p><em>3 May 2002:</em> After suggestion from Bertrand Mansion I added a couple of method to get databases, tables, and fields (of a table) list. They works they way they should from the C API recommandation (specific function for DBs, and tables, standard query for fields). I also started to enhance the handling of the charset encoding (suggestion by John Guy). This feature is not yet fully implemented. The new version (0.5.4) is only available through CVS so far (see information from the <a href="http://sourceforge.net/cvs/?group_id=42424">sourceforge project page</a>).</p> <p><em>14 March 2002:</em> A new target for SMySQL framework exists. It gives you access to a all in one version of the framework: libmysqlclient is statically linked inside the framework... No more need for a root user to install the mysqlclient library. The version of libmysqlclient is 3.23.49 (the lataest stable version). As a test I have linked <a href="Display/index.html">MySQL Display</a> to this version of the framework, and it works perfectly (<a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.dmg.gz">Download</a>).</p> <p><em>13 March 2002:</em> There was a error in the <a href="Doc/HowTo_Build_MySQL.rtf">How To Build MySQL file</a>. This error is corrected (I forgot one command line to copy the /usr/share/libtool/ltconfig to ltconfig in th esource directory, before applying the patch). Now the instruction should run Ok. Some improovement can still be done in the patch: adding a proper prebinding adress, proper version... Still to be done. -Thanks to Camille for pointing the problem to me-</p> |
|
From: Serge C. <ser...@us...> - 2002-05-03 09:38:45
|
Update of /cvsroot/mysql-cocoa/SMySQL_test/SMySQL_test.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv32567
Modified Files:
project.pbxproj cohen.pbxuser
Log Message:
Test methods listDBs, listTables, listFields, and description (via NSLog). Still some strange bug on queryString.
Serge Cohen; MySQL Cocoa Project, May 3rd 2002....
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL_test/SMySQL_test.pbproj/project.pbxproj,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** project.pbxproj 1 Jan 2002 17:18:50 -0000 1.1.1.1
--- project.pbxproj 3 May 2002 09:38:43 -0000 1.2
***************
*** 83,87 ****
children = (
08FB779EFE84155DC02AAC07,
! F51B52A301CA9BD80130DCEA,
);
isa = PBXGroup;
--- 83,87 ----
children = (
08FB779EFE84155DC02AAC07,
! F53FB7F002821286018C5719,
);
isa = PBXGroup;
***************
*** 103,107 ****
);
buildSettings = {
! FRAMEWORK_SEARCH_PATHS = /Users/cohen/Library/Frameworks;
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/bin";
--- 103,107 ----
);
buildSettings = {
! FRAMEWORK_SEARCH_PATHS = "/Users/cohen/Library/Frameworks /Users/cohen/Projects/mysql-cocoa/SMySQL/build";
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/bin";
***************
*** 143,147 ****
files = (
08FB77A4FE84155DC02AAC07,
! F51B52A401CA9BD80130DCEA,
);
isa = PBXFrameworksBuildPhase;
--- 143,147 ----
files = (
08FB77A4FE84155DC02AAC07,
! F53FB7F102821286018C5719,
);
isa = PBXFrameworksBuildPhase;
***************
*** 200,204 ****
};
};
! F51B52A301CA9BD80130DCEA = {
isa = PBXFrameworkReference;
name = SMySQL.framework;
--- 200,204 ----
};
};
! F53FB7F002821286018C5719 = {
isa = PBXFrameworkReference;
name = SMySQL.framework;
***************
*** 206,211 ****
refType = 0;
};
! F51B52A401CA9BD80130DCEA = {
! fileRef = F51B52A301CA9BD80130DCEA;
isa = PBXBuildFile;
settings = {
--- 206,211 ----
refType = 0;
};
! F53FB7F102821286018C5719 = {
! fileRef = F53FB7F002821286018C5719;
isa = PBXBuildFile;
settings = {
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL_test/SMySQL_test.pbproj/cohen.pbxuser,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cohen.pbxuser 1 Jan 2002 17:18:50 -0000 1.1.1.1
--- cohen.pbxuser 3 May 2002 09:38:43 -0000 1.2
***************
*** 14,21 ****
Frame = "{{0, 23}, {946, 508}}";
Split0 = {
- ActiveTab = 1;
Frame = "{{224, 0}, {722, 508}}";
Split0 = {
! Frame = "{{0, 232}, {722, 276}}";
};
SplitCount = 1;
--- 14,20 ----
Frame = "{{0, 23}, {946, 508}}";
Split0 = {
Frame = "{{224, 0}, {722, 508}}";
Split0 = {
! Frame = "{{0, 24}, {722, 484}}";
};
SplitCount = 1;
|
|
From: Serge C. <ser...@us...> - 2002-05-03 09:38:38
|
Update of /cvsroot/mysql-cocoa/SMySQL_test
In directory usw-pr-cvs1:/tmp/cvs-serv32517
Modified Files:
main2.m
Log Message:
Test methods listDBs, listTables, listFields, and description (via NSLog). Still some strange bug on queryString.
Serge Cohen; MySQL Cocoa Project, May 3rd 2002.
Index: main2.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL_test/main2.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main2.m 13 Feb 2002 13:35:25 -0000 1.2
--- main2.m 3 May 2002 09:38:36 -0000 1.3
***************
*** 44,48 ****
connection = [[SMySQLConnection alloc] initToHost:@"localhost" withLogin:@"ObjC" password:@"MySQL_class" usingPort:0];
[connection selectDB:@"test_mysqlclass"];
! result = [[connection queryString:@"select * from test1"] retain];
count = [result numOfFields];
names = [result fetchFieldsName];
--- 44,48 ----
connection = [[SMySQLConnection alloc] initToHost:@"localhost" withLogin:@"ObjC" password:@"MySQL_class" usingPort:0];
[connection selectDB:@"test_mysqlclass"];
! result = [connection queryString:@"select * from test1"];
count = [result numOfFields];
names = [result fetchFieldsName];
***************
*** 62,66 ****
}
}
! [result release];
[pool release];
return 0;
--- 62,80 ----
}
}
! NSLog (@"Here is the NSLog of a SMySQLResult : \n%@", result);
! // [result release];
!
! // result = [connection listFields:nil forTable:@"test1"];
! // NSLog (@"Here is theNSLog of a SMySQLResult (listFields:nil forTable:test1) %@", result);
!
! result = [connection listDBs:nil];
! NSLog (@"Here is the NSLog of a SMySQLResult (listDBs) : \n%@", result);
!
! result = [connection listDBs:@"test\\_%%"];
! NSLog (@"Here is the NSLog of a SMySQLResult (listDBs:test\\_%%) : \n%@", result);
!
! result = [connection listTables:nil];
! NSLog (@"Here is the NSLog of a SMySQLResult (listTables) : \n%@", result);
!
[pool release];
return 0;
|
|
From: Serge C. <ser...@us...> - 2002-05-03 09:36:49
|
Update of /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv31598
Modified Files:
project.pbxproj cohen.pbxuser
Log Message:
Added methods listDBs, listTables, listFields. First test for supporting proper charset encoding. Still some strange bug on queryString.
Serge Cohen; MySQL Cocoa Project, May 3rd 2002....
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/project.pbxproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** project.pbxproj 10 Apr 2002 15:12:17 -0000 1.7
--- project.pbxproj 3 May 2002 09:36:47 -0000 1.8
***************
*** 116,120 ****
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.2;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_VERSION = A;
--- 116,120 ----
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.4;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_VERSION = A;
***************
*** 161,165 ****
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.3d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
--- 161,165 ----
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.4d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
***************
*** 410,414 ****
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.2;
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = mysqlclient_source/headers;
--- 410,414 ----
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.4;
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = mysqlclient_source/headers;
***************
*** 452,456 ****
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.3d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
--- 452,456 ----
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.4d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
***************
*** 1849,1853 ****
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.2;
FRAMEWORK_VERSION = A;
LIBRARY_SEARCH_PATHS = /usr/local/lib/mysql;
--- 1849,1853 ----
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
! DYLIB_CURRENT_VERSION = 0.5.4;
FRAMEWORK_VERSION = A;
LIBRARY_SEARCH_PATHS = /usr/local/lib/mysql;
***************
*** 1895,1899 ****
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.3d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
--- 1895,1899 ----
<string>????</string>
<key>CFBundleVersion</key>
! <string>0.5.4d1</string>
<key>NSPrincipalClass</key>
<string>SMySQLConnection</string>
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/cohen.pbxuser,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cohen.pbxuser 10 Apr 2002 15:12:17 -0000 1.8
--- cohen.pbxuser 3 May 2002 09:36:47 -0000 1.9
***************
*** 7,10 ****
--- 7,12 ----
F51A62D7022D7C2A01952E7A,
);
+ breakpoints = (
+ );
perUserDictionary = {
PBXWorkspaceConfiguration = {
***************
*** 14,21 ****
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
- ActiveTab = 2;
Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 216}, {719, 408}}";
};
SplitCount = 1;
--- 16,22 ----
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 24}, {719, 600}}";
};
SplitCount = 1;
***************
*** 58,62 ****
};
Tab3 = {
! Frame = "{{0, 0}, {663, 295}}";
};
TabCount = 4;
--- 59,63 ----
};
Tab3 = {
! Frame = "{{0, 0}, {747, 295}}";
};
TabCount = 4;
|
|
From: Serge C. <ser...@us...> - 2002-05-03 09:36:42
|
Update of /cvsroot/mysql-cocoa/SMySQL
In directory usw-pr-cvs1:/tmp/cvs-serv31519
Modified Files:
SMySQLConnection.h SMySQLConnection.m SMySQLResult.h
SMySQLResult.m
Log Message:
Added methods listDBs, listTables, listFields. First test for supporting proper charset encoding. Still some strange bug on queryString.
Serge Cohen; MySQL Cocoa Project, May 3rd 2002.
Index: SMySQLConnection.h
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SMySQLConnection.h 10 Apr 2002 15:12:08 -0000 1.4
--- SMySQLConnection.h 3 May 2002 09:36:39 -0000 1.5
***************
*** 30,35 ****
#define kSMySQL_default_option CLIENT_COMPRESS
! #define kSMySQLConnectionDefaultSocket "/tmp/mysql.sock"
! #define kMySQLConnection_error_not_inited 1000
@interface SMySQLConnection : NSObject {
--- 30,35 ----
#define kSMySQL_default_option CLIENT_COMPRESS
! #define kSMySQLConnectionDefaultSocket MYSQL_UNIX_ADDR
! #define kSMySQLConnection_error_not_inited 1000
@interface SMySQLConnection : NSObject {
***************
*** 38,43 ****
NSStringEncoding mEncoding; /*"The encoding used by MySQL server, to ISO-1 default"*/
}
!
+ (NSDictionary *) getMySQLLocales;
/*"
Initialisation
--- 38,48 ----
NSStringEncoding mEncoding; /*"The encoding used by MySQL server, to ISO-1 default"*/
}
! /*"
! Getting default of MySQL
! "*/
+ (NSDictionary *) getMySQLLocales;
+ + (NSStringEncoding) encodingForMySQLEncoding:(const char *) mysqlEncoding;
+ + (NSStringEncoding) defaultMySQLEncoding;
+
/*"
Initialisation
***************
*** 78,81 ****
--- 83,95 ----
- (my_ulonglong)insertId;
+
+ /*"
+ Getting description of the database structure
+ "*/
+ - (SMySQLResult *)listDBs:(NSString *)dbsName;
+ - (SMySQLResult *)listTables:(NSString *)tablesName;
+ - (SMySQLResult *)listFields:(NSString *)fieldsName forTable:(NSString *)tableName;
+
+
/*"
Server information
***************
*** 93,96 ****
--- 107,115 ----
- (void)disconnect;
- (void)dealloc;
+
+ /*"
+ Private methods, internam use only
+ "*/
+ - (const char *)cStringFromString:(NSString *)theString;
@end
Index: SMySQLConnection.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SMySQLConnection.m 10 Apr 2002 15:12:08 -0000 1.4
--- SMySQLConnection.m 3 May 2002 09:36:39 -0000 1.5
***************
*** 59,62 ****
--- 59,102 ----
+ + (NSStringEncoding) encodingForMySQLEncoding:(const char *) mysqlEncoding
+ /*"From the name a charset in mysql format return the proper NSStringEncoding corresponding to this charset.
+ This method is not complete for the moment, I hope people using non "supported" encoding will addd them when one needs it, and send me back the modification.
+
+ As off version 4.0 of MySQL, choice in :
+ big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin1_de latin2 latin5 sjis swe7 tis620 ujis usa7 win1250 win1251ukr
+ "*/
+ {
+ if (!strcmp(mysqlEncoding, "latin1")) {
+ return NSISOLatin1StringEncoding;
+ }
+ if (!strcmp(mysqlEncoding, "latin2")) {
+ return NSISOLatin2StringEncoding;
+ }
+ if (!strcmp(mysqlEncoding, "win1250")) {
+ return NSWindowsCP1250StringEncoding;
+ }
+ if (!strcmp(mysqlEncoding, "cp1251")) {
+ return NSWindowsCP1251StringEncoding;
+ }
+ if (!strcmp(mysqlEncoding, "euc_kr")) {
+ return NSJapaneseEUCStringEncoding;
+ }
+ if (!strcmp(mysqlEncoding, "sjis")) {
+ return NSShiftJISStringEncoding;
+ }
+
+ // default to iso latin 1, even if it is not exact (throw an exception?)
+ return NSISOLatin1StringEncoding;
+ }
+
+
+ + (NSStringEncoding) defaultMySQLEncoding
+ /*"Return the default charset of the library mysqlclient used.
+ "*/
+ {
+ return [SMySQLConnection encodingForMySQLEncoding:MYSQL_CHARSET];
+ }
+
+
- (id)init
/*"
***************
*** 174,178 ****
- (void)setEncoding:(NSStringEncoding) theEncoding
/*"
! Select the encoding used by the server for data transfert. This usefull for the output NSString (query result) to be Ok even for character which are not ASCII
"*/
{
--- 214,218 ----
- (void)setEncoding:(NSStringEncoding) theEncoding
/*"
! Select the encoding used by the server for data transfert. This is usefull for the output NSString (query result) to be Ok even for character which are not ASCII
"*/
{
***************
*** 207,210 ****
--- 247,251 ----
{
#warning What to do if one of the string is a nil pointer?
+ #warning What about the encoding?
const char *theHost = [host UTF8String];
const char *theLogin = [login UTF8String];
***************
*** 224,227 ****
--- 265,269 ----
return mConnected = NO;
}
+ mEncoding = [SMySQLConnection encodingForMySQLEncoding:mysql_character_set_name(mConnection)];
return mConnected = YES;
}
***************
*** 242,245 ****
--- 284,288 ----
{
#warning What to do if one of the string is a nil pointer?
+ #warning What about the encoding?
const char *theSocket = [socket UTF8String];
const char *theLogin = [login UTF8String];
***************
*** 259,262 ****
--- 302,306 ----
return mConnected = NO;
}
+ mEncoding = [SMySQLConnection encodingForMySQLEncoding:mysql_character_set_name(mConnection)];
return mConnected = YES;
}
***************
*** 276,279 ****
--- 320,324 ----
}
if (mConnected) {
+ #warning What about the encoding?
const char *theDBName = [dbName UTF8String];
if (mysql_select_db(mConnection, theDBName) == NULL) {
***************
*** 291,294 ****
--- 336,340 ----
{
if (mConnection) {
+ #warning What about the encoding?
return [NSString stringWithUTF8String:mysql_error(mConnection)];
}
***************
*** 306,310 ****
return mysql_errno(mConnection);
}
! return kMySQLConnection_error_not_inited;
}
--- 352,356 ----
return mysql_errno(mConnection);
}
! return kSMySQLConnection_error_not_inited;
}
***************
*** 337,340 ****
--- 383,387 ----
mysql_real_escape_string(mConnection, theCEscBuffer, theCDataBuffer, theLength);
+ #warning What about the encoding?
theReturn = [NSString stringWithUTF8String:theCEscBuffer];
free (theCEscBuffer);
***************
*** 346,356 ****
/*"
Takes a query string and return an SMySQLResult object holding the result of the query.
"*/
{
SMySQLResult *theResult = [SMySQLResult alloc];
! const char *theCQuery = [query UTF8String];
! if (mysql_query(mConnection, theCQuery) == NULL) {
theResult = [theResult initWithMySQLPtr:mConnection encoding:mEncoding];
if (theResult) {
[theResult autorelease];
--- 393,408 ----
/*"
Takes a query string and return an SMySQLResult object holding the result of the query.
+ The returned SMySQLResult is not retained, the client is responsible for that (it's autoreleased before being returned)
"*/
{
SMySQLResult *theResult = [SMySQLResult alloc];
! #warning We should get a proper encoding for the string (more likely iso latin-1) (done?)
! const char *theCQuery = [self cStringFromString:query];
! int theQueryCode;
! NSLog (@"in queryString query is : %s -in ObjC : %@-\n", theCQuery, query);
! if ((theQueryCode = mysql_query(mConnection, theCQuery)) == NULL) {
theResult = [theResult initWithMySQLPtr:mConnection encoding:mEncoding];
+ NSLog (@"the SMySQLResult is %@\n", theResult);
if (theResult) {
[theResult autorelease];
***************
*** 358,361 ****
--- 410,419 ----
return theResult;
}
+ else {
+ NSLog (@"Problem in queryString error code is : %d, query is : %s -in ObjC : %@-\n", theQueryCode, theCQuery, query);
+ }
+ if (theResult) {
+ [theResult release];
+ }
return nil;
}
***************
*** 384,387 ****
--- 442,534 ----
+ - (SMySQLResult *)listDBs:(NSString *)dbsName
+ /*"
+ Return a list of database which name correspond to the string dbsName. The comparison is done with wild card extension : % and _. The result should correspond to the queryString:@"SHOW databases [LIKE wild]"; but implemented with mysql_list_dbs.
+ If an empty string of nil is passed as dbsName, all databases will be shown.
+ "*/
+ {
+ SMySQLResult *theResult = [SMySQLResult alloc];
+ MYSQL_RES *theResPtr;
+
+ if ((dbsName == nil) || ([dbsName isEqualToString:@""])) {
+ if (theResPtr = mysql_list_dbs(mConnection, NULL)) {
+ [theResult initWithResPtr: theResPtr encoding: mEncoding];
+ }
+ else {
+ [theResult init];
+ }
+ }
+ else {
+ const char *theCDBsName = (const char *)[[dbsName dataUsingEncoding: mEncoding allowLossyConversion: YES] bytes];
+ if (theResPtr = mysql_list_dbs(mConnection, theCDBsName)) {
+ [theResult initWithResPtr: theResPtr encoding: mEncoding];
+ }
+ else {
+ [theResult init];
+ }
+ }
+ if (theResult) {
+ [theResult autorelease];
+ }
+ return theResult;
+ }
+
+
+ - (SMySQLResult *)listTables:(NSString *)tablesName
+ /*"
+ From within a database, give back the list of table which name correspond to tablesName (with wild card %, _ extension). Correspond to queryString:@"SHOW tables [LIKE wild]"; uses mysql_list_tables function.
+ If an empty string of nil is passed as tablesName, all tables will be shown.
+ "*/
+ {
+ SMySQLResult *theResult = [SMySQLResult alloc];
+ MYSQL_RES *theResPtr;
+
+ if ((tablesName == nil) || ([tablesName isEqualToString:@""])) {
+ if (theResPtr = mysql_list_tables(mConnection, NULL)) {
+ [theResult initWithResPtr: theResPtr encoding: mEncoding];
+ }
+ else {
+ [theResult init];
+ }
+ }
+ else {
+ const char *theCTablesName = (const char *)[[tablesName dataUsingEncoding: mEncoding allowLossyConversion: YES] bytes];
+ if (theResPtr = mysql_list_tables(mConnection, theCTablesName)) {
+ [theResult initWithResPtr: theResPtr encoding: mEncoding];
+ }
+ else {
+ [theResult init];
+ }
+ }
+ if (theResult) {
+ [theResult autorelease];
+ }
+ return theResult;
+ }
+
+
+ - (SMySQLResult *)listFields:(NSString *)fieldsName forTable:(NSString *)tableName
+ /*"
+ Show all the fields of the table tableName which name correspond to fieldsName (with wild card expansion : %,_). Indeed, and as recommanded from mysql reference, this method is NOT using mysql_list_fields but the queryString:@"" method.
+ If an empty string of nil is passed as fieldsName, all fields (of tableName) will be returned.
+ "*/
+ {
+ SMySQLResult *theResult;
+
+ if ((fieldsName == nil) || ([fieldsName isEqualToString:@""])) {
+ NSString *theQuery = [NSString stringWithFormat:@"SHOW COLUMNS FROM %@", tableName];
+ theResult = [self queryString:theQuery];
+ }
+ else {
+ NSString *theQuery = [NSString stringWithFormat:@"SHOW COLUMNS FROM %@ LIKE '%@'", tableName, fieldsName];
+ theResult = [self queryString:theQuery];
+ }
+ if (theResult) {
+ [theResult autorelease];
+ }
+ return theResult;
+ }
+
+
- (NSString *)serverInfo
/*"
***************
*** 390,393 ****
--- 537,541 ----
{
if (mConnected) {
+ #warning Is the string is really encoded in UTF8 : NO, in iso latin1
return [NSString stringWithUTF8String: mysql_get_server_info(mConnection)];
}
***************
*** 438,441 ****
--- 586,603 ----
[super dealloc];
return;
+ }
+
+
+ - (const char *)cStringFromString:(NSString *)theString
+ /*"
+ For internal use only. Transform a NSString to a C type string (ended with \0) using ethe character set from the SMySQLConnection.
+ Lossy conversions are enabled.
+ "*/
+ {
+ NSMutableData *theData = [NSMutableData dataWithCapacity:0];
+ [theData appendData:[theString dataUsingEncoding: mEncoding allowLossyConversion: YES]];
+
+ [theData increaseLengthBy:1];
+ return (const char *)[theData bytes];
}
Index: SMySQLResult.h
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLResult.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SMySQLResult.h 15 Jan 2002 18:52:34 -0000 1.2
--- SMySQLResult.h 3 May 2002 09:36:39 -0000 1.3
***************
*** 39,43 ****
Init used #{only} by #{SMySQLConnection}
"*/
! - (id)initWithMySQLPtr:(MYSQL*)mySQLPtr encoding:(NSStringEncoding)theEncoding;
/*"
--- 39,46 ----
Init used #{only} by #{SMySQLConnection}
"*/
!
! - (id)initWithMySQLPtr:(MYSQL *)mySQLPtr encoding:(NSStringEncoding)theEncoding;
! - (id)initWithResPtr:(MYSQL_RES *)mySQLResPtr encoding:(NSStringEncoding)theEncoding;
! - (id)init;
/*"
***************
*** 54,58 ****
- (void)dataSeek:(my_ulonglong)row;
- //- (SMySQLRow *)fetchRow;
- (NSDictionary *)fetchRowAsDictionary;
- (NSArray *)fetchRowAsArray;
--- 57,60 ----
***************
*** 69,72 ****
--- 71,79 ----
- (BOOL)isBlobAtIndex:(unsigned int)index;
- (BOOL)isBlobForKey:(NSString *)key;
+
+ /*"
+ Utility method
+ "*/
+ - (NSString *)description;
/*"
Index: SMySQLResult.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLResult.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SMySQLResult.m 15 Jan 2002 18:52:34 -0000 1.2
--- SMySQLResult.m 3 May 2002 09:36:39 -0000 1.3
***************
*** 75,78 ****
--- 75,103 ----
}
mResult = mysql_store_result(mySQLPtr);
+ if (mMySQLLocales == NULL) {
+ mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
+ }
+ return self;
+ }
+
+
+ - (id)initWithResPtr:(MYSQL_RES *)mySQLResPtr encoding:(NSStringEncoding)theEncoding
+ /*"
+ This metod it is used internally by SMySQLConnection object when it have already a MYSQL_RES object to initialise SMySQLResult object.
+ Initialise a SMySQLResult with the MYSQL_RES pointer (returned by such a function as mysql_list_dbs).
+ NB: SMySQLResult should be made by using one of the method of SMySQLConnection.
+ "*/
+ {
+ self = [super init];
+ mEncoding = theEncoding;
+ if (mResult) {
+ mysql_free_result(mResult);
+ mResult = NULL;
+ }
+ if (mNames) {
+ [mNames release];
+ mNames = NULL;
+ }
+ mResult = mySQLResPtr;
if (mResult == NULL) {
[self autorelease];
***************
*** 82,88 ****
mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
}
! return self;
}
- (my_ulonglong)numOfRows
/*"
--- 107,135 ----
mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
}
! return self;
}
+ - (id)init
+ /*"
+ Empty init, normaly of NO use to the user, again, SMySQLResult should be made through calls to SMySQLConnection
+ "*/
+ {
+ self = [super init];
+ mEncoding = [SMySQLConnection defaultMySQLEncoding];
+ if (mResult) {
+ mysql_free_result(mResult);
+ mResult = NULL;
+ }
+ if (mNames) {
+ [mNames release];
+ mNames = NULL;
+ }
+ if (mMySQLLocales == NULL) {
+ mMySQLLocales = [[SMySQLConnection getMySQLLocales] retain];
+ }
+ return self;
+ }
+
+
- (my_ulonglong)numOfRows
/*"
***************
*** 96,99 ****
--- 143,147 ----
}
+
- (unsigned int)numOfFields
/*"
***************
*** 110,114 ****
- (void)dataSeek:(my_ulonglong)row
/*"
! Go to a precise row in the selected result.
"*/
{
--- 158,162 ----
- (void)dataSeek:(my_ulonglong)row
/*"
! Go to a precise row in the selected result. 0 is the very first row
"*/
{
***************
*** 120,130 ****
- /*
- - (SMySQLRow *)fetchRow
- {
- }
- */
-
-
- (NSDictionary *)fetchRowAsDictionary
/*"
--- 168,171 ----
***************
*** 183,186 ****
--- 224,228 ----
// a switch on theLength[i] would do that...
// Here it will crash if it's not default presentation : TIMESTAMP(14)
+ #warning What about the encoding? For all the rest of the method
theCurrentObj = [NSCalendarDate dateWithString:[NSString stringWithUTF8String:theData] calendarFormat:@"%Y%m%d%H%M%S"];
break;
***************
*** 286,289 ****
--- 328,332 ----
// a switch on theLength[i] would do that...
// Here it will crash if it's not default presentation : TIMESTAMP(14)
+ #warning What about the encoding? For all the rest of the method
theCurrentObj = [NSCalendarDate dateWithString:[NSString stringWithUTF8String:theData] calendarFormat:@"%Y%m%d%H%M%S"];
break;
***************
*** 361,364 ****
--- 404,408 ----
theField = mysql_fetch_fields(mResult);
for (i=0; i<theNumFields; i++) {
+ #warning What about the encoding? For all the rest of the method
NSString *theName = [NSString stringWithUTF8String:theField[i].name];
[theNamesArray addObject:theName];
***************
*** 647,650 ****
--- 691,733 ----
}
+
+ - (NSString *)description
+ /*"
+ Return a (long) string containing the table of results, first line being the fields name, next line(s) the row(s). Useful to have NSLog a SMySQLResult (example).
+ "*/
+ {
+ if (mResult == NULL) {
+ return @"This is an empty SMySQLResult\n";
+ }
+ else {
+ NSMutableString *theString = [NSMutableString stringWithCapacity:0];
+ int i, numFields;
+ NSArray *theRow;
+ MYSQL_ROW_OFFSET thePosition;
+
+ // First line, saying we are displaying a SMySQLResult
+ [theString appendString:@"SMySQLResult:\n"];
+ // Second line: the field names, tab separated
+ [self fetchFieldsName];
+ for (i=0; i<((numFields = [mNames count])-1); i++) {
+ [theString appendFormat:@"%@\t", [mNames objectAtIndex:i]];
+ }
+ [theString appendFormat:@"%@\n", [mNames objectAtIndex:i]];
+ // Next lines, the records (saving current position to put it back after the full display)
+ thePosition = mysql_row_tell(mResult);
+ [self dataSeek:0];
+ while (theRow = [self fetchRowAsArray]) {
+ for (i=0; i<(numFields - 1); i++) {
+ [theString appendFormat:@"%@\t", [theRow objectAtIndex:i]];
+ }
+ [theString appendFormat:@"%@\n", [theRow objectAtIndex:i]];
+ }
+ // Returning to the proper row
+ mysql_row_seek(mResult,thePosition);
+ return theString;
+ }
+ }
+
+
- (void)dealloc
/*
***************
*** 652,661 ****
*/
{
! if (mResult){
mysql_free_result(mResult);
}
! if (mNames){
[mNames autorelease];
}
[super dealloc];
return;
--- 735,748 ----
*/
{
! if (mResult) {
mysql_free_result(mResult);
}
! if (mNames) {
[mNames autorelease];
}
+ if (mMySQLLocales) {
+ [mMySQLLocales autorelease];
+ }
+
[super dealloc];
return;
|
|
From: Serge C. <ser...@us...> - 2002-04-10 18:38:17
|
Update of /cvsroot/mysql-cocoa/SMySQL
In directory usw-pr-cvs1:/tmp/cvs-serv30278
Modified Files:
SMySQLConnection.h SMySQLConnection.m
Log Message:
Added an nil pointer check to selectDB, and a couple of warnings for similar problems.
Serge Cohen; 10 April 2002. MySQL Cocoa project.
Index: SMySQLConnection.h
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMySQLConnection.h 21 Jan 2002 17:15:03 -0000 1.3
--- SMySQLConnection.h 10 Apr 2002 15:12:08 -0000 1.4
***************
*** 65,68 ****
--- 65,69 ----
- (unsigned int)getLastErrorID;
- (BOOL)isConnected;
+ - (BOOL)checkConnection;
/*"
Index: SMySQLConnection.m
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQLConnection.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMySQLConnection.m 21 Jan 2002 17:15:03 -0000 1.3
--- SMySQLConnection.m 10 Apr 2002 15:12:08 -0000 1.4
***************
*** 202,207 ****
--- 202,210 ----
- port is the TCP port to use to connect. If port = 0, uses the default port from mysql.h
+
+ For the moment the implementation might not be safe if you have a nil pointer to one of the NSString* variables (underestand: I don't know what the result will be).
"*/
{
+ #warning What to do if one of the string is a nil pointer?
const char *theHost = [host UTF8String];
const char *theLogin = [login UTF8String];
***************
*** 234,239 ****
- pass is the password corresponding to the user name
! "*/
{
const char *theSocket = [socket UTF8String];
const char *theLogin = [login UTF8String];
--- 237,245 ----
- pass is the password corresponding to the user name
!
! For the moment the implementation might not be safe if you have a nil pointer to one of the NSString* variables (underestand: I don't know what the result will be).
! "*/
{
+ #warning What to do if one of the string is a nil pointer?
const char *theSocket = [socket UTF8String];
const char *theLogin = [login UTF8String];
***************
*** 260,265 ****
--- 266,278 ----
/*"
Select a database to work with. The SMySQLConnection object needs to be properly inited and connected to a server. If a connection is not yet set or the selection of the database didn't worked, return NO. return yes in the normal case, where the database is properly selected.
+
+ So far, if dbName is a nil pointer it will return NO (as if it cannot connect), most likely this will throw an exception in the future.
"*/
{
+ if (dbName == nil) {
+ #warning Should throw an exception, illegal string pointer (nil)
+ // Here we should throw an exception, impossible to select a databse is the string is indeed a nil pointer
+ return NO;
+ }
if (mConnected) {
const char *theDBName = [dbName UTF8String];
***************
*** 303,306 ****
--- 316,328 ----
return mConnected;
}
+
+ - (BOOL)checkConnection
+ /*"
+ Check if the connection to the server is still on; if not, tries to reconnect (changing no parameters from the MYSQL pointer). This method just uses mysql_ping().
+ "*/
+ {
+ return (BOOL)(! mysql_ping(mConnection));
+ }
+
- (NSString *)prepareBinaryData:(NSData *)theData
|
|
From: Serge C. <ser...@us...> - 2002-04-10 18:30:50
|
Update of /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv30326
Modified Files:
project.pbxproj cohen.pbxuser
Log Message:
Added an nil pointer check to selectDB, and a couple of warnings for similar problems.
Serge Cohen; 10 April 2002. MySQL Cocoa project....
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/project.pbxproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** project.pbxproj 13 Mar 2002 21:07:29 -0000 1.6
--- project.pbxproj 10 Apr 2002 15:12:17 -0000 1.7
***************
*** 406,409 ****
--- 406,410 ----
F51A62DB022D7C2A01952E7A,
F51A62DC022D7C2A01952E7A,
+ F5F2A38502648DA50121D426,
);
buildSettings = {
***************
*** 2034,2037 ****
--- 2035,2051 ----
F5777C9001DE6747016C2008 = {
buildActionMask = 12;
+ files = (
+ );
+ generatedFileNames = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ name = "Shell Script";
+ neededFileNames = (
+ );
+ shellPath = /bin/sh;
+ shellScript = "MKDIRS=\"mkdir -p\"\nAUTODOC=/usr/local/bin/autodoc\nAUTODOC_FLAGS=\"-copydocs -timestamp -allclasses\"\nAUTODOC_FORMAT=html\nAUTODOC_LANGUAGE=English\nexport AD_COPYRIGHT=\"MySQL Cocoa Project\"\n\n# If autodoc is not installed, we quit without any error\ntest -x $AUTODOC || exit 0\n\nPUBLIC_DOC_INSTALLDIR=\"$SYMROOT/$PRODUCT_NAME.framework/Resources/$AUTODOC_LANGUAGE.lproj/Documentation\"\n\n# We need to write down file names here\nAUTODOC_FILES=\"SMySQLConnection.h SMySQLResult.h\"\nAUTODOC_DOCDIR=\"$PUBLIC_DOC_INSTALLDIR\"\n\nOTHER_AUTODOC_FLAGS=\"-typedirs -allclasses -combine -force -nosingles\"\n\nALL_AUTODOC_FLAGS=\"$AUTODOC_FLAGS $OTHER_AUTODOC_FLAGS\"\n\n$MKDIRS $PUBLIC_DOC_INSTALLDIR\n$AUTODOC $ALL_AUTODOC_FLAGS -format $AUTODOC_FORMAT -dest $AUTODOC_DOCDIR $AUTODOC_FILES\n";
+ };
+ F5F2A38502648DA50121D426 = {
+ buildActionMask = 2147483647;
files = (
);
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/cohen.pbxuser,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cohen.pbxuser 13 Mar 2002 19:59:36 -0000 1.7
--- cohen.pbxuser 10 Apr 2002 15:12:17 -0000 1.8
***************
*** 3,7 ****
0867D690FE84028FC02AAC07 = {
activeBuildStyle = F51A62D4022D7B3301952E7A;
! activeTarget = F5649F0E023FDCA201D04C4B;
addToTargets = (
F51A62D7022D7C2A01952E7A,
--- 3,7 ----
0867D690FE84028FC02AAC07 = {
activeBuildStyle = F51A62D4022D7B3301952E7A;
! activeTarget = F51A62D7022D7C2A01952E7A;
addToTargets = (
F51A62D7022D7C2A01952E7A,
|
|
From: Serge C. <ser...@us...> - 2002-03-14 09:59:48
|
Update of /cvsroot/mysql-cocoa/Documentation/website/Display In directory usw-pr-cvs1:/tmp/cvs-serv14312/Display Modified Files: index.html Log Message: Added new links in the web pages, updated the history (new releases). Serge Cohen, March 14th 2002. MySQL Cocoa project. Index: index.html =================================================================== RCS file: /cvsroot/mysql-cocoa/Documentation/website/Display/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.html 28 Feb 2002 12:20:52 -0000 1.6 --- index.html 14 Mar 2002 09:59:44 -0000 1.7 *************** *** 25,28 **** --- 25,29 ---- <!--Updates--> + <p><em>14 March 2002:</em> The new version of the <a href="../index.html">SMySQL frameworks</a> includes directly the libmysqlclient in the framework. Now you don't need any more to install the MySQL client side library to run MySQL Display. Just <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.dmg.gz">download</a> it from sourceforge, expand, mount the disk image and launch the application (this should be done in three double-click).</p> <p><em>28 February 2002:</em> The framework is now ready to be embeded in the application(s) using it. I still have a problem for statically linking the libmysqlclient, so use of SMySQL framework still needs the installation of libmysqlclient.dylib (which is done by MySQL_Cocoa_installers_0.5.2.dmg.gz).Now MySQL Display should run without asking for a non exitent framwork.</p> <p><em>22 January 2002:</em> Very first version of this GUI for MacOSX released... Please (as usual) give me some feed back</p> *************** *** 37,47 **** <a name="files"><h2>Files</h2></a> ! ! <p>The easiest way to get these things to run now is to get the Install MySQLClient package, which is in a gziped image disk (along with the AutoStart package and the MySQL Display application).<em> Next paragraphs explain the "old" way</em>.<br> <em>Remark:</em> the library in this package is given a pre-binding adress, which is not the case of the result you'll have if you compile your own</p> <ul> <li>Binaries to install fast..</li> <ul> ! <li>Installing the Client side of MySQL, and getting the MySQL Display application (as a free bonus): <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Cocoa_installers_0.5.2.dmg.gz">Disk image</a>, MD5: fc88e839717d3a478fa44c56387da908</li> </ul> --- 38,49 ---- <a name="files"><h2>Files</h2></a> ! <p>The <em>new and easiest</em> way to install the MySQL Display application: <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.dmg.gz">Download</a> the gziped disk image (same as coming link), expand the downloaded file, mount the disk image, and test the application (Yes! you can drag it everywhere you like!). <em> Next paragraphs explain the "old" and "painfull" way</em>.<p> ! <p>The "old" way to get these things to run now is to get the Install MySQLClient package, which is in a gziped image disk (along with the AutoStart package and the MySQL Display application).<br> <em>Remark:</em> the library in this package is given a pre-binding adress, which is not the case of the result you'll have if you compile your own</p> <ul> <li>Binaries to install fast..</li> <ul> ! <li>Getting the MySQL Display application (alone): <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.dmg.gz">Disk image</a>, MD5: 5a082b108a8eba108b27d22bdc0a3b42</li> ! <li>Installing the complete Client side of MySQL, and getting the MySQL Display application (as a free bonus): <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Cocoa_installers_0.5.2.dmg.gz">Disk image</a>, MD5: fc88e839717d3a478fa44c56387da908</li> </ul> |
|
From: Serge C. <ser...@us...> - 2002-03-14 09:59:48
|
Update of /cvsroot/mysql-cocoa/Documentation/website In directory usw-pr-cvs1:/tmp/cvs-serv14312 Modified Files: index.html Log Message: Added new links in the web pages, updated the history (new releases). Serge Cohen, March 14th 2002. MySQL Cocoa project. Index: index.html =================================================================== RCS file: /cvsroot/mysql-cocoa/Documentation/website/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** index.html 13 Mar 2002 12:36:18 -0000 1.9 --- index.html 14 Mar 2002 09:59:44 -0000 1.10 *************** *** 23,26 **** --- 23,27 ---- <!--Updates--> + <p><em>14 March 2002:</em> A new target for SMySQL framework exists. It gives you access to a all in one version of the framework: libmysqlclient is statically linked inside the framework... No more need for a root user to install the mysqlclient library. The version of libmysqlclient is 3.23.49 (the lataest stable version). As a test I have linked <a href="Display/index.html">MySQL Display</a> to this version of the framework, and it works perfectly (<a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.dmg.gz">Download</a>).</p> <p><em>13 March 2002:</em> There was a error in the <a href="Doc/HowTo_Build_MySQL.rtf">How To Build MySQL file</a>. This error is corrected (I forgot one command line to copy the /usr/share/libtool/ltconfig to ltconfig in th esource directory, before applying the patch). Now the instruction should run Ok. Some improovement can still be done in the patch: adding a proper prebinding adress, proper version... Still to be done. -Thanks to Camille for pointing the problem to me-</p> <p><em>28 February 2002:</em> The framework is now ready to be embeded in the application(s) using it,I still have a problem for statically linking the libmysqlclient, so use of SMySQL framework still needs the installation of libmysqlclient.dylib (which is done by MySQL_Cocoa_installers_0.5.2.dmg.gz). Now the <a href="Display/index.html">MySQL Display</a> should run.</p> *************** *** 47,58 **** <li>Binaries to install fast..</li> <ul> <li>Installing the Client side of MySQL, and getting the <a href="Display/index.html">MySQL Display application</a> (as a free bonus): <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Cocoa_installers_0.5.2.dmg.gz">Disk image</a>, MD5: fc88e839717d3a478fa44c56387da908</li> </ul> ! <li>Mac OS X 10.1 or higher sources, version 0.5.1 r1 (note: not up to date, see CVS for version 0.5.2)</li> <ul> ! <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/SMySQL_0.5.tgz">SMySQL Framework v0.5.0r1</a>, MD5: 3608e6e298cb45836f793081e6f809ab</li> <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/SMySQL_0.5.1.tgz">SMySQL Framework v0.5.1r1</a>, MD5: a0ecaf53275cc068002b8e45cb0b6695</li> </ul> <ul> <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.1.tgz">MySQL Display v0.1.1r1</a>, MD5: 159f7032d426d5bc5eb9397402925482</li> </ul> --- 48,62 ---- <li>Binaries to install fast..</li> <ul> + <li>Getting the MySQL Display application (alone and independent of any library): <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.dmg.gz">Disk image</a>, MD5 : 5a082b108a8eba108b27d22bdc0a3b42</li> <li>Installing the Client side of MySQL, and getting the <a href="Display/index.html">MySQL Display application</a> (as a free bonus): <a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Cocoa_installers_0.5.2.dmg.gz">Disk image</a>, MD5: fc88e839717d3a478fa44c56387da908</li> </ul> ! <li>Mac OS X 10.1 or higher sources, version 0.5.3 r1 <! (note: not up to date, see CVS for version 0.5.2) !></li> <ul> ! <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/SMySQL_0.5.3.tgz">SMySQL Framework v0.5.3r1</a>, MD5: 536de45748d9db6218e7e4d3eecaea06</li> <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/SMySQL_0.5.1.tgz">SMySQL Framework v0.5.1r1</a>, MD5: a0ecaf53275cc068002b8e45cb0b6695</li> + <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/SMySQL_0.5.tgz">SMySQL Framework v0.5.0r1</a>, MD5: 3608e6e298cb45836f793081e6f809ab</li> </ul> <ul> + <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.2.tgz">MySQL Display v0.1.2r1</a>, MD5: 42bc3b8210541b166bac51a4d8a08aa7</li> <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/MySQL_Display_0.1.1.tgz">MySQL Display v0.1.1r1</a>, MD5: 159f7032d426d5bc5eb9397402925482</li> </ul> *************** *** 61,64 **** --- 65,69 ---- </ul> <ul> + <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/Documentation_0.5.3.tgz">Documentation and patches v0.5.3r1</a>, MD5: 420486b817e964550abf814f0b69a4ce</li> <li><a href="http://ftp1.sourceforge.net/mysql-cocoa/Documentation_0.5.tgz">Documentation and patches v0.5.0r1</a></li> </ul> *************** *** 66,70 **** <li>Patches</li> <ul> ! <li><a href="patches/ltconfig_1.2S.diff">lt_config_1.2S patche for ltconfig of MySQL</a>, MD5: 959b0a944c809413f6c7e190c1f470af</li> </ul> --- 71,75 ---- <li>Patches</li> <ul> ! <li><a href="patches/ltconfig_1.2S.diff">lt_config_1.2S patche for ltconfig of /usr/share/libtool</a>, MD5: 959b0a944c809413f6c7e190c1f470af</li> </ul> *************** *** 79,83 **** <li>HOWTO: Build MySQL on OS X</li> <ul> ! <li><a href="Doc/HowTo_Build_MySQL.rtf">version 0.5</a> rtf format, MD5: 59e301b33c1eb84f45ab281a80bf19ae</li> </ul> </ul> --- 84,88 ---- <li>HOWTO: Build MySQL on OS X</li> <ul> ! <li><a href="Doc/HowTo_Build_MySQL.rtf">version 0.5.3</a> rtf format, MD5: c1911d90d4d523addb87cb2809d81bf1</li> </ul> </ul> |
|
From: Serge C. <ser...@us...> - 2002-03-13 21:07:32
|
Update of /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj In directory usw-pr-cvs1:/tmp/cvs-serv17455 Modified Files: project.pbxproj Log Message: Changed the version of the framework to 0.5.3. Serge Cohen, March 13th 2002. MySQL Cocoa Project.... Index: project.pbxproj =================================================================== RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/project.pbxproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** project.pbxproj 13 Mar 2002 19:59:36 -0000 1.5 --- project.pbxproj 13 Mar 2002 21:07:29 -0000 1.6 *************** *** 161,165 **** <string>????</string> <key>CFBundleVersion</key> ! <string>0.5.2d1</string> <key>NSPrincipalClass</key> <string>SMySQLConnection</string> --- 161,165 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>0.5.3d1</string> <key>NSPrincipalClass</key> <string>SMySQLConnection</string> *************** *** 451,455 **** <string>????</string> <key>CFBundleVersion</key> ! <string>0.5.2d1</string> <key>NSPrincipalClass</key> <string>SMySQLConnection</string> --- 451,455 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>0.5.3d1</string> <key>NSPrincipalClass</key> <string>SMySQLConnection</string> *************** *** 1851,1855 **** FRAMEWORK_VERSION = A; LIBRARY_SEARCH_PATHS = /usr/local/lib/mysql; - OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_LDFLAGS = "-seg1addr 0x08800000"; --- 1851,1854 ---- *************** *** 1895,1899 **** <string>????</string> <key>CFBundleVersion</key> ! <string>0.5.2d1</string> <key>NSPrincipalClass</key> <string>SMySQLConnection</string> --- 1894,1898 ---- <string>????</string> <key>CFBundleVersion</key> ! <string>0.5.3d1</string> <key>NSPrincipalClass</key> <string>SMySQLConnection</string> |
|
From: Serge C. <ser...@us...> - 2002-03-13 19:59:39
|
Update of /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv29704/SMySQL.pbproj
Modified Files:
cohen.pbxuser project.pbxproj
Log Message:
Added a new target for the fully embeded SMySQL framework.
This should run WITHOUT any libmysqlclient on the runing system (so to speak, no more dependencies except to standard libraries)
Serge Cohen, March 13th 2002. MySQL Cocoa Project.
Index: cohen.pbxuser
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/cohen.pbxuser,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cohen.pbxuser 28 Feb 2002 10:18:50 -0000 1.6
--- cohen.pbxuser 13 Mar 2002 19:59:36 -0000 1.7
***************
*** 3,7 ****
0867D690FE84028FC02AAC07 = {
activeBuildStyle = F51A62D4022D7B3301952E7A;
! activeTarget = F51A62D7022D7C2A01952E7A;
addToTargets = (
F51A62D7022D7C2A01952E7A,
--- 3,7 ----
0867D690FE84028FC02AAC07 = {
activeBuildStyle = F51A62D4022D7B3301952E7A;
! activeTarget = F5649F0E023FDCA201D04C4B;
addToTargets = (
F51A62D7022D7C2A01952E7A,
***************
*** 11,21 ****
ContentSize = "{971, 647}";
LeftSlideOut = {
! ActiveTab = 3;
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
ActiveTab = 2;
! Frame = "{{224, 0}, {747, 624}}";
Split0 = {
! Frame = "{{0, 216}, {747, 408}}";
};
SplitCount = 1;
--- 11,21 ----
ContentSize = "{971, 647}";
LeftSlideOut = {
! ActiveTab = 0;
Frame = "{{0, 23}, {971, 624}}";
Split0 = {
ActiveTab = 2;
! Frame = "{{252, 0}, {719, 624}}";
Split0 = {
! Frame = "{{0, 216}, {719, 408}}";
};
SplitCount = 1;
***************
*** 53,59 ****
};
Tab2 = {
! BuildMessageFrame = "{{0, 0}, {749, 95}}";
! BuildTranscriptFrame = "{{0, 104}, {749, 90}}";
! Frame = "{{0, 0}, {747, 192}}";
};
Tab3 = {
--- 53,59 ----
};
Tab2 = {
! BuildMessageFrame = "{{0, 0}, {721, 95}}";
! BuildTranscriptFrame = "{{0, 104}, {721, 90}}";
! Frame = "{{0, 0}, {719, 192}}";
};
Tab3 = {
***************
*** 126,129 ****
--- 126,134 ----
uiCtxt = {
sepNavWindowFrame = "{{61, 197}, {750, 502}}";
+ };
+ };
+ F5649F0E023FDCA201D04C4B = {
+ activeExec = 0;
+ customExecs = {
};
};
Index: project.pbxproj
===================================================================
RCS file: /cvsroot/mysql-cocoa/SMySQL/SMySQL.pbproj/project.pbxproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** project.pbxproj 28 Feb 2002 10:18:50 -0000 1.4
--- project.pbxproj 13 Mar 2002 19:59:36 -0000 1.5
***************
*** 39,42 ****
--- 39,43 ----
034768E0FF38A50411DB9C8B,
F51A62D6022D7C2901952E7A,
+ F5649F0D023FDCA201D04C4B,
);
isa = PBXGroup;
***************
*** 73,76 ****
--- 74,78 ----
0867D69CFE84028FC02AAC07,
[...1682 lines suppressed...]
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5649F1D023FE1A901D04C4B = {
+ fileRef = F5165EC101C50ABB0116CAC1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5649F1E023FE1A901D04C4B = {
+ fileRef = 0867D69BFE84028FC02AAC07;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5777C9001DE6747016C2008 = {
! buildActionMask = 12;
files = (
);
|
|
From: Serge C. <ser...@us...> - 2002-03-13 19:56:43
|
Update of /cvsroot/mysql-cocoa/SMySQL/mysqlclient_source In directory usw-pr-cvs1:/tmp/cvs-serv28930 Log Message: Added some files from mysql version 3.23.49 to be able to have a fully embeded framework (not using any shared library fro mmysql). Serge Cohen, March 13th 2002. MySQL Cocoa project. Status: Vendor Tag: mysql-cocoa Release Tags: start N SMySQL/mysqlclient_source/array.c N SMySQL/mysqlclient_source/bchange.c N SMySQL/mysqlclient_source/bmove.c N SMySQL/mysqlclient_source/bmove_upp.c N SMySQL/mysqlclient_source/charset.c N SMySQL/mysqlclient_source/conf_to_src.c N SMySQL/mysqlclient_source/ctype.c N SMySQL/mysqlclient_source/ctype_autoconf.c N SMySQL/mysqlclient_source/ctype_extra_sources.c N SMySQL/mysqlclient_source/dbug.c N SMySQL/mysqlclient_source/default.c N SMySQL/mysqlclient_source/errmsg.c N SMySQL/mysqlclient_source/errors.c N SMySQL/mysqlclient_source/get_password.c N SMySQL/mysqlclient_source/getopt.c N SMySQL/mysqlclient_source/getopt1.c N SMySQL/mysqlclient_source/getvar.c N SMySQL/mysqlclient_source/hash.c N SMySQL/mysqlclient_source/int2str.c N SMySQL/mysqlclient_source/is_prefix.c N SMySQL/mysqlclient_source/libmysql.c N SMySQL/mysqlclient_source/list.c N SMySQL/mysqlclient_source/llstr.c N SMySQL/mysqlclient_source/longlong2str.c N SMySQL/mysqlclient_source/mf_cache.c N SMySQL/mysqlclient_source/mf_casecnv.c N SMySQL/mysqlclient_source/mf_dirname.c N SMySQL/mysqlclient_source/mf_fn_ext.c N SMySQL/mysqlclient_source/mf_format.c N SMySQL/mysqlclient_source/mf_iocache.c N SMySQL/mysqlclient_source/mf_loadpath.c N SMySQL/mysqlclient_source/mf_pack.c N SMySQL/mysqlclient_source/mf_path.c N SMySQL/mysqlclient_source/mf_tempfile.c N SMySQL/mysqlclient_source/mf_unixpath.c N SMySQL/mysqlclient_source/mf_wcomp.c N SMySQL/mysqlclient_source/mulalloc.c N SMySQL/mysqlclient_source/my_alloc.c N SMySQL/mysqlclient_source/my_compress.c N SMySQL/mysqlclient_source/my_create.c N SMySQL/mysqlclient_source/my_delete.c N SMySQL/mysqlclient_source/my_div.c N SMySQL/mysqlclient_source/my_error.c N SMySQL/mysqlclient_source/my_fopen.c N SMySQL/mysqlclient_source/my_fstream.c N SMySQL/mysqlclient_source/my_getwd.c N SMySQL/mysqlclient_source/my_init.c N SMySQL/mysqlclient_source/my_lib.c N SMySQL/mysqlclient_source/my_malloc.c N SMySQL/mysqlclient_source/my_messnc.c N SMySQL/mysqlclient_source/my_net.c N SMySQL/mysqlclient_source/my_once.c N SMySQL/mysqlclient_source/my_open.c N SMySQL/mysqlclient_source/my_pread.c N SMySQL/mysqlclient_source/my_pthread.c N SMySQL/mysqlclient_source/my_read.c N SMySQL/mysqlclient_source/my_realloc.c N SMySQL/mysqlclient_source/my_seek.c N SMySQL/mysqlclient_source/my_static.c N SMySQL/mysqlclient_source/my_static.h N SMySQL/mysqlclient_source/my_symlink.c N SMySQL/mysqlclient_source/my_thr_init.c N SMySQL/mysqlclient_source/my_write.c N SMySQL/mysqlclient_source/mysys_priv.h N SMySQL/mysqlclient_source/net.c N SMySQL/mysqlclient_source/password.c N SMySQL/mysqlclient_source/safemalloc.c N SMySQL/mysqlclient_source/str2int.c N SMySQL/mysqlclient_source/strcend.c N SMySQL/mysqlclient_source/strcont.c N SMySQL/mysqlclient_source/strend.c N SMySQL/mysqlclient_source/strfill.c N SMySQL/mysqlclient_source/string.c N SMySQL/mysqlclient_source/strinstr.c N SMySQL/mysqlclient_source/strmake.c N SMySQL/mysqlclient_source/strmov.c N SMySQL/mysqlclient_source/strnlen.c N SMySQL/mysqlclient_source/strnmov.c N SMySQL/mysqlclient_source/strto.c N SMySQL/mysqlclient_source/strtoll.c N SMySQL/mysqlclient_source/strtoull.c N SMySQL/mysqlclient_source/strxmov.c N SMySQL/mysqlclient_source/thr_mutex.c N SMySQL/mysqlclient_source/typelib.c N SMySQL/mysqlclient_source/violite.c N SMySQL/mysqlclient_source/headers/client_priv.h N SMySQL/mysqlclient_source/headers/completion_hash.h N SMySQL/mysqlclient_source/headers/config-win.h N SMySQL/mysqlclient_source/headers/dbug.h N SMySQL/mysqlclient_source/headers/errmsg.h N SMySQL/mysqlclient_source/headers/ft_global.h N SMySQL/mysqlclient_source/headers/getopt.h N SMySQL/mysqlclient_source/headers/global.h N SMySQL/mysqlclient_source/headers/hash.h N SMySQL/mysqlclient_source/headers/heap.h N SMySQL/mysqlclient_source/headers/log_event.h N SMySQL/mysqlclient_source/headers/m_ctype.h N SMySQL/mysqlclient_source/headers/m_string.h N SMySQL/mysqlclient_source/headers/merge.h N SMySQL/mysqlclient_source/headers/my_alarm.h N SMySQL/mysqlclient_source/headers/my_base.h N SMySQL/mysqlclient_source/headers/my_bitmap.h N SMySQL/mysqlclient_source/headers/my_config.h N SMySQL/mysqlclient_source/headers/my_dir.h N SMySQL/mysqlclient_source/headers/my_global.h N SMySQL/mysqlclient_source/headers/my_list.h N SMySQL/mysqlclient_source/headers/my_net.h N SMySQL/mysqlclient_source/headers/my_no_pthread.h N SMySQL/mysqlclient_source/headers/my_nosys.h N SMySQL/mysqlclient_source/headers/my_pthread.h N SMySQL/mysqlclient_source/headers/my_readline.h N SMySQL/mysqlclient_source/headers/my_sys.h N SMySQL/mysqlclient_source/headers/my_tree.h N SMySQL/mysqlclient_source/headers/myisam.h N SMySQL/mysqlclient_source/headers/myisammrg.h N SMySQL/mysqlclient_source/headers/myisampack.h N SMySQL/mysqlclient_source/headers/mysql.h N SMySQL/mysqlclient_source/headers/mysql_com.h N SMySQL/mysqlclient_source/headers/mysql_version.h N SMySQL/mysqlclient_source/headers/mysqld_error.h N SMySQL/mysqlclient_source/headers/mysys_err.h N SMySQL/mysqlclient_source/headers/nisam.h N SMySQL/mysqlclient_source/headers/queues.h N SMySQL/mysqlclient_source/headers/raid.h N SMySQL/mysqlclient_source/headers/sql_string.h N SMySQL/mysqlclient_source/headers/sslopt-case.h N SMySQL/mysqlclient_source/headers/sslopt-longopts.h N SMySQL/mysqlclient_source/headers/sslopt-usage.h N SMySQL/mysqlclient_source/headers/sslopt-vars.h N SMySQL/mysqlclient_source/headers/t_ctype.h N SMySQL/mysqlclient_source/headers/thr_alarm.h N SMySQL/mysqlclient_source/headers/thr_lock.h N SMySQL/mysqlclient_source/headers/violite.h No conflicts created by this import ***** Bogus filespec: - Imported sources |
|
From: Serge C. <ser...@us...> - 2002-03-13 19:44:02
|
Update of /cvsroot/mysql-cocoa/SMySQL/mysqlclient_source In directory usw-pr-cvs1:/tmp/cvs-serv26253/mysqlclient_source Log Message: Directory /cvsroot/mysql-cocoa/SMySQL/mysqlclient_source added to the repository |
|
From: Serge C. <ser...@us...> - 2002-03-13 12:36:21
|
Update of /cvsroot/mysql-cocoa/Documentation/website In directory usw-pr-cvs1:/tmp/cvs-serv31864 Modified Files: index.html Log Message: Update the index.html file (updates list). Serge Cohen, March 13th 2002. MySQL Cocoa Project. Index: index.html =================================================================== RCS file: /cvsroot/mysql-cocoa/Documentation/website/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.html 28 Feb 2002 11:32:39 -0000 1.8 --- index.html 13 Mar 2002 12:36:18 -0000 1.9 *************** *** 23,26 **** --- 23,27 ---- <!--Updates--> + <p><em>13 March 2002:</em> There was a error in the <a href="Doc/HowTo_Build_MySQL.rtf">How To Build MySQL file</a>. This error is corrected (I forgot one command line to copy the /usr/share/libtool/ltconfig to ltconfig in th esource directory, before applying the patch). Now the instruction should run Ok. Some improovement can still be done in the patch: adding a proper prebinding adress, proper version... Still to be done. -Thanks to Camille for pointing the problem to me-</p> <p><em>28 February 2002:</em> The framework is now ready to be embeded in the application(s) using it,I still have a problem for statically linking the libmysqlclient, so use of SMySQL framework still needs the installation of libmysqlclient.dylib (which is done by MySQL_Cocoa_installers_0.5.2.dmg.gz). Now the <a href="Display/index.html">MySQL Display</a> should run.</p> <p><em>22 January 2002:</em> Few correction to the framework (v 0.5.1 now). I finally managed to create packages, so <em>the AutoStart package finally works</em>. There is also a new package installer : <em>Install MySQL Client</em>. This will install the client side of MySQL, the minimum required to run a C (or Objective-C !!!) client on your Mac OS X system. At last (but not least), I have written a new application using the framework to display queries in a GUI <a href="Display/index.html"><em>MySQL Display</em></a>. Even if it is still very basic this is (as far as I know) the first <em>free</em> GUI for MySQL on Mac OS X. I'm sure you'll want some modification for this GUI, send your whishes on the users mailing list. |
|
From: Serge C. <ser...@us...> - 2002-03-13 11:58:05
|
Update of /cvsroot/mysql-cocoa/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv22744 Modified Files: HowTo_Build_MySQL.rtf Log Message: New updates to the How_To build MySQL. In previous version I forgot line for copying the ltconfig script (from /usr/share/libtool) Serge Cohen, March 13th 2002. MySQL Cocoa Project. Index: HowTo_Build_MySQL.rtf =================================================================== RCS file: /cvsroot/mysql-cocoa/Documentation/HowTo_Build_MySQL.rtf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HowTo_Build_MySQL.rtf 12 Mar 2002 20:51:45 -0000 1.2 --- HowTo_Build_MySQL.rtf 13 Mar 2002 11:57:55 -0000 1.3 *************** *** 61,64 **** --- 61,65 ---- \f2\i\b port \f1\i0\b0 http://mysql-cocoa.sourceforge.net/patches/ltconfig_1.2S.diff --output ltconfig_1.2S.diff\ + >cp /usr/share/libtool/ltconfig .\ >patch <ltconfig_1.2S.diff\ \ |
|
From: Serge C. <ser...@us...> - 2002-03-13 11:58:05
|
Update of /cvsroot/mysql-cocoa/Documentation/website/Doc In directory usw-pr-cvs1:/tmp/cvs-serv22744/website/Doc Modified Files: HowTo_Build_MySQL.rtf Log Message: New updates to the How_To build MySQL. In previous version I forgot line for copying the ltconfig script (from /usr/share/libtool) Serge Cohen, March 13th 2002. MySQL Cocoa Project. Index: HowTo_Build_MySQL.rtf =================================================================== RCS file: /cvsroot/mysql-cocoa/Documentation/website/Doc/HowTo_Build_MySQL.rtf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HowTo_Build_MySQL.rtf 12 Mar 2002 20:51:46 -0000 1.2 --- HowTo_Build_MySQL.rtf 13 Mar 2002 11:57:56 -0000 1.3 *************** *** 61,64 **** --- 61,65 ---- \f2\i\b port \f1\i0\b0 http://mysql-cocoa.sourceforge.net/patches/ltconfig_1.2S.diff --output ltconfig_1.2S.diff\ + >cp /usr/share/libtool/ltconfig .\ >patch <ltconfig_1.2S.diff\ \ |
|
From: Serge C. <ser...@us...> - 2002-03-12 20:51:50
|
Update of /cvsroot/mysql-cocoa/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv20737
Modified Files:
HowTo_Build_MySQL.rtf
Log Message:
Few changes to the How_To... problems in the way I was using curl...
Serge Cohen, March 12th 2002. MySQL Cocoa project.
Index: HowTo_Build_MySQL.rtf
===================================================================
RCS file: /cvsroot/mysql-cocoa/Documentation/HowTo_Build_MySQL.rtf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** HowTo_Build_MySQL.rtf 1 Jan 2002 17:20:20 -0000 1.1.1.1
--- HowTo_Build_MySQL.rtf 12 Mar 2002 20:51:45 -0000 1.2
***************
*** 1,4 ****
{\rtf1\mac\ansicpg10000\cocoartf100
! {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww14960\viewh10920\viewkind0
--- 1,5 ----
{\rtf1\mac\ansicpg10000\cocoartf100
! {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-BoldOblique;
! }
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww14960\viewh10920\viewkind0
***************
*** 10,14 ****
\f1\b0\fs28 \cf0 This document explain how to build mySQL so that you can use it with the SMySQL framework.\
! Serge Cohen (ser...@m4...), MySQL Cocoa project. December 30th, 2001.\
\
--- 11,15 ----
\f1\b0\fs28 \cf0 This document explain how to build mySQL so that you can use it with the SMySQL framework.\
! Serge Cohen (ser...@m4...), MySQL Cocoa project. March 12th, 2002.\
\
***************
*** 31,35 ****
\ulnone \
Make the setting for http proxy if necessary : \
! >setenv FTP_PROXY http://hostname:port\
\
Get the source:\
--- 32,40 ----
\ulnone \
Make the setting for http proxy if necessary : \
! >setenv FTP_PROXY http://
! \f2\i\b hostname
! \f1\i0\b0 :
! \f2\i\b port
! \f1\i0\b0 \
\
Get the source:\
***************
*** 51,55 ****
\
get and apply the patch for ltconfig:\
! >curl http://mysql-cocoa.sourceforge.net/Documentation/ltconfig_1.2S.diff --output ltconfig_1.2S.diff\
>patch <ltconfig_1.2S.diff\
\
--- 56,64 ----
\
get and apply the patch for ltconfig:\
! >curl --proxy
! \f2\i\b proxy.name
! \f1\i0\b0 :
! \f2\i\b port
! \f1\i0\b0 http://mysql-cocoa.sourceforge.net/patches/ltconfig_1.2S.diff --output ltconfig_1.2S.diff\
>patch <ltconfig_1.2S.diff\
\
|
|
From: Serge C. <ser...@us...> - 2002-03-12 20:51:50
|
Update of /cvsroot/mysql-cocoa/Documentation/website/Doc
In directory usw-pr-cvs1:/tmp/cvs-serv20737/website/Doc
Modified Files:
HowTo_Build_MySQL.rtf
Log Message:
Few changes to the How_To... problems in the way I was using curl...
Serge Cohen, March 12th 2002. MySQL Cocoa project.
Index: HowTo_Build_MySQL.rtf
===================================================================
RCS file: /cvsroot/mysql-cocoa/Documentation/website/Doc/HowTo_Build_MySQL.rtf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** HowTo_Build_MySQL.rtf 11 Jan 2002 16:19:54 -0000 1.1.1.1
--- HowTo_Build_MySQL.rtf 12 Mar 2002 20:51:46 -0000 1.2
***************
*** 1,4 ****
{\rtf1\mac\ansicpg10000\cocoartf100
! {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww14960\viewh10920\viewkind0
--- 1,5 ----
{\rtf1\mac\ansicpg10000\cocoartf100
! {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-BoldOblique;
! }
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww14960\viewh10920\viewkind0
***************
*** 10,14 ****
\f1\b0\fs28 \cf0 This document explain how to build mySQL so that you can use it with the SMySQL framework.\
! Serge Cohen (ser...@m4...), MySQL Cocoa project. December 30th, 2001.\
\
--- 11,15 ----
\f1\b0\fs28 \cf0 This document explain how to build mySQL so that you can use it with the SMySQL framework.\
! Serge Cohen (ser...@m4...), MySQL Cocoa project. March 12th, 2002.\
\
***************
*** 31,35 ****
\ulnone \
Make the setting for http proxy if necessary : \
! >setenv FTP_PROXY http://hostname:port\
\
Get the source:\
--- 32,40 ----
\ulnone \
Make the setting for http proxy if necessary : \
! >setenv FTP_PROXY http://
! \f2\i\b hostname
! \f1\i0\b0 :
! \f2\i\b port
! \f1\i0\b0 \
\
Get the source:\
***************
*** 51,55 ****
\
get and apply the patch for ltconfig:\
! >curl http://mysql-cocoa.sourceforge.net/Documentation/ltconfig_1.2S.diff --output ltconfig_1.2S.diff\
>patch <ltconfig_1.2S.diff\
\
--- 56,64 ----
\
get and apply the patch for ltconfig:\
! >curl --proxy
! \f2\i\b proxy.name
! \f1\i0\b0 :
! \f2\i\b port
! \f1\i0\b0 http://mysql-cocoa.sourceforge.net/patches/ltconfig_1.2S.diff --output ltconfig_1.2S.diff\
>patch <ltconfig_1.2S.diff\
\
|
