Regenerated the patchset to include an Oracle GDL adaptor fix in the connect string.

Monotone-Parent: 7b7b1e4cf6acf0c232cc90058bb111775177f721
Monotone-Revision: 39f32528b95bdfdf11fdfa90c982474366e48f89

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-03T16:47:27
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2009-04-03 16:47:27 +00:00
parent bb5c345431
commit bdbeb7e3ba
1 changed files with 9 additions and 0 deletions

View File

@ -319,6 +319,15 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
return NO;
}
@@ -414,7 +448,7 @@
// Under Oracle 10g, the third parameter of OCILogon() has the form: [//]host[:port][/service_name]
// See http://download-west.oracle.com/docs/cd/B12037_01/network.101/b10775/naming.htm#i498306 for
// all juicy details.
- database = [[NSString stringWithFormat:@"%@:%@", [o serverName], [o port]] UTF8String];
+ database = [[NSString stringWithFormat:@"%@:%@/%@", [o serverName], [o port], [o databaseName]] UTF8String];
// We logon to the database.
if (OCILogon(_oci_env, _oci_err, &_oci_ctx, (const OraText*)username, strlen(username),
@@ -422,6 +456,7 @@
{
NSLog(@"FAILED: OCILogon(). username = %s password = %s"