From f6aab1ee83ef42fae81f7cfd25d135eb80d0ef1b Mon Sep 17 00:00:00 2001 From: rfm Date: Tue, 27 Oct 2009 12:34:41 +0000 Subject: [PATCH] Try to get notifications sent properly. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@28895 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ECPG.pgm | 10 +- JDBC.m | 10 +- MySQL.m | 8 +- Oracle.pm | 10 +- Postgres.m | 16 +- SQLite.m | 8 +- 7 files changed, 546 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10abb4c..69a9784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,518 @@ +2009-10-27 Richard Frith-Macdonald + + * ECPG.pgm: + * MySQL.m: + * Postgres.m: + * Oracle.pm: + * SQLite.m: + * JDBC.m: + Don't call -backendConnect or -backendDisconnect ... should be using + the public API so that notifications are sent properly. + +2009-10-01 Richard Frith-Macdonald + + * configure.ac: workaround autoconf bug. + * configure: regenerate + +2009-09-16 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + Add convenience method to convert array of rows into an array of + columns. + +2009-09-08 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + Add method for executing a batch of statements/transactions and + returning any failed statements/transactions to they can be + re-done. Also add methods to manipulate the statements in a + transaction so we can retry things intelligently. + +2008-11-12 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + Add support for tracking the number of consecutive connection failures + and imposing a delay between connection attempts. + * JDBC.m: fix typo + * GNUMmakefile: bump version + +2008-07-19 Nicola Pero + + * configure.ac: Documented the --with-additional-include=, + --with-additional-lib=, --with-postgres-dir= and + --with-jre-architecture= options. + * configure: Regenerated. + * config.h.in: Regenerated. + +2008-03-03 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + * ECPG.pgm: + * MySQL.m: + * Postgres.m: + * SQLite.m: + * JDBC.m: + Alter to allow control of both the way records are strored and + the way they are listed ... so people can make performance + optimisations. + +2008-02-21 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + Experimental new method to set a thread to do all cached + queries on and to perform asynchronous updates if other + threads request information which is in the cache but + past its expiry date. Should allow threads to use + config information from a database without blocking + unnecessarily. + +2008-02-15 Richard Frith-Macdonald + + * SQLClient.m: Fix memory leak when executing transaction. + +2007-10-23 Richard Frith-Macdonald + + Postgres.m: Use E'...' syntax for bytea if it is available. + +2007-09-14 Richard Frith-Macdonald + + Update to LGPL3 + +2007-07-21 Richard Frith-Macdonald + + * SQLClient.m: Fix retasin bug copying transactions. + * JDBC.m: Update for new batch code + +2007-07-09 Richard Frith-Macdonald + + * SQLClient.m: Post notifications upon connect and disconnect. + +2007-07-07 Richard Frith-Macdonald + + * SQLClient.m: Fix error causing loss of some debug output when an + exception occurs in a transaction. + Rewrite transaction code to support execution with automatic retry of + statements when batching. + * JDBC.m: Update for new transaction code + +2007-04-01 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + * testSQLite.m: + * testJDBC.m: + * MySQL.m: + * Postgres.m: + * GNUmakefile: + * SQLite.m: + * JDBC.m: + * testMySQL.m: + * testPostgres.m: + * testECPG.m: + Updates to build on MacOS-X with apple-apple-appple + +2007-03-08 Richard Frith-Macdonald + + * SQLClient.h: + * SQLClient.m: + * MySQL.m: + * ECPG.pgm: + * Postgres.m: + * Oracle.pm: + * SQLite.m: + * JDBC.m: + Add KVC support for SQLRecord. Make SQLRecord into a class cluster + with a single concrete implementation for now. Extend API to allow + specifying of an alternative SQLRecord subclass when doing a query + so that query results can be efficiently stored into custom subclasses + rather than having to first be retrieved into an SQLRecord and then + copied. + +2007-02-14 Nicola Pero + + * GNUmakefile (BUNDLE_INSTALL_DIR): Set using GNUSTEP_BUNDLES, + not GNUSTEP_INSTALLATION_DIR. + +2007-01-29 Richard Frith-Macdonald + + * JDBC.m: Add JDBC2.0 batching for when all statements in a + transaction are simple (ie no NSData arguments) and the batch + API is supported by the driver. + * testJDBC.m: Add simple transaction/batch test. + +2007-01-29 Richard Frith-Macdonald + + * JDBC.m: Add support for SQLTransaction class to batch JDBC + operations. + +2006-12-24 Richard Frith-Macdonald + + * JDBC.m: Don't store pointer to jni information in local variable + until after we have opened the connection to the database, or we + may be using a null pointer and generate a crash. + +2006-12-22 Richard Frith-Macdonald + + * configure.ac: save/restore LIBS after jdbc check so that other + tests don't try to link jre + +2006-10-06 Nicola Pero + + * GNUmakefile.wrapper.objc.preamble (ADDITIONAL_LIB_DIRS): Added + variable so that the wrapper compiles before the library is installed. + +2006-10-02 Nicola Pero + + * configure.ac: Do not read gnustep configuration which is never + used. + * configure.ac: Added --disable-jdbc-bundle, + --disable-mysql-bundle, --disable-sqllite-bundle, + --disable-postgres-bundle flags to be able to turn some bundles + off (regardless of config results). + * configure: Regenerated. + +2006-10-01 Graham J Lee + + * configure.ac: Fix to use GNUSTEP_CONFIG_FILE environment variable. + +2006-09-14 Richard Frith-Macdonald + + * JDBC push and pop local frames to avoid memory leaks. + +2006-08-03 Nicola Pero + + * SQLClient.m ([SQLClient -quoteString:]): Renamed local variable + that had the same name as the method argument. + +2005-06-23 Richard Frith-Macdonald + + * SQLClient.m: transaction efficiency tweak. + * GNUmakefile: bump version to 1.3 as the new blob marker changes and + postgres quoting changes alter behavior. + +2005-06-04 Richard Frith-Macdonald + + * SQLClient.m: avoid useless compiler warnings. + +2005-05-25 Richard Frith-Macdonald + + * configure.ac: Check for new postgres string escaping + * configure: Regenerate + * SQLClient.h: Add quoteString method for subclasses to override + * SQLClient.m: Add new method and change marker for blobs to be + one that shouldn't occur in a quoted string. + * SQLite.m: Use new blob marker + * MySQL.m: Use new blob marker + * config.h.in: Add new postgres escaping function + * Postgres.m: Handle new escaping + * testPostgres.m: Add check for escaping odd characters. + +2005-02-22 Richard Frith-Macdonald + + * SQLClient.m: Support quoting of NSArray and NSSet objects. + +2006-01-11 Nicola Pero + + * configure.ac: Do not source GNUSTEP_CONFIG_FILE if it doesn't + exist, so that the library can be used with older versions of + gnustep-make/gnustep-base too. :-) + * configure: Regenerated. + +2005-11-23 Richard Frith-Macdonald + + Added SQLite backend support. + +2005-11-14 Richard Frith-Macdonald + + Factor out WebServer into separate library, and timer and caching + stuff into Performance library. Make this library depend on the + Performance library. + +2005-10-27 Richard Frith-Macdonald + + * WebServer.m: Add more accurate timestamps and implement request + and session duration logging. Also add a unique session ID number + to each log to make it easy to track requests on a session. + +2005-09-28 Richard Frith-Macdonald + + * GNUmakefile.wrapper.objc.preamble: new file + * SQLClient.jigs: new file + * GNUmakefile: Provide java wrappings for SQLClient and friends + +2005-09-28 Richard Frith-Macdonald + + * SQLClient.m: boost performance of quoting a little. + Provide -count method for transactions. + + +2005-09-26 Richard Frith-Macdonald + + * SQLClient.h: Clean up caching/timestamps. + * SQLClient.m: ditto. + +2005-09-22 Richard Frith-Macdonald + + * SQLClient.h: Rewrite caching, and expose cache for external use. + * SQLClient.m: ditto. + +2005-09-20 Richard Frith-Macdonald + + * SQLClient.h: make SQLRecord modifieable (replace values). + * SQLClient.m: ditto. + +2005-09-15 Richard Frith-Macdonald + + * configure.ac: Locate postgres 8.0 on debian + * configure: regenerate + +2005-08-03 Richard Frith-Macdonald + + * GNUmakefile: Add SQLClient_LIBRARIES_DEPEND_UPON for apple as + suggested by Yen-Ju Chen. + * SQLClient.m: Don't call allocation debug functions on apple, + and avoid bogus apple compiler warning. + Guard against nil object passed to NSMapRemove() ... the apple + implementation crashes on this. + +2005-08-02 Richard Frith-Macdonald + + * GNUmakefile: Don't build WebServer stuff on MacOS-X when using the + apple runtime (and presumably foundation). + +2005-07-07 Richard Frith-Macdonald + + * MySQL.m: + * SQLClient.m: + * WebServer.h: + * WebServer.m: + Tweaks to keep gcc-4 happy (signedness issues) and add support for + using separate ssl conmfig for different IP addresses. + +2005-06-21 Richard Frith-Macdonald + + * SQLClient.m: Expand tilde in paths searched for backend bundles. + +2005-05-25 Richard Frith-Macdonald + + * Postgres.m: Clear connection if an exception occurs while + disconnecting ... otherwise a failed disconnect can prevent + any new connection from being established. + Improve quoting of strings to be a bit more efficient and to + remove nul characters. + +2005-05-09 Richard Frith-Macdonald + + * WebServer.[hm]: Add method to encode a form from a dictionary + into a data object ... convenience for where form data is needed. + +2005-03-02 Richard Frith-Macdonald + + * WebServer.[hm]: Add support for basic http authentication either + via username/password pairs in property list or in database table. + * SQLClient.[hm]: Add methods to query database with local caching + of results, for use on systems needing high performance, where + database query (and/or database client-server comms) overheads are + important. + +2005-02-25 Adam Fedor + + * Version 1.1.0: + * GNUmakefile: Add version. + * README: Add ftp location. + +Sat Feb 19 04:20:00 2004 Richard Frith-Macdonald + + * Makefile: Build two versions of each bundle with different library + linkage for systems where dybnamic linker symbol visibility differs. + * SQLClient.m: Try alternative bundle versions. + +Mon Jan 07 15:20:00 2004 Richard Frith-Macdonald + + * Makefile: Bump version. + * SQLClient.h: Improve documentation. + +Sat Dec 18 06:00:00 2004 Richard Frith-Macdonald + + * WebServer.m: Fix bug in substitution of nil values into templates. + Add new method to vend static pages. + +Wed Dec 15 13:10:00 2004 Richard Frith-Macdonald + + * MySQL.m, Postgres.m, ECPG.pgm: Do NSLog() logging of field + information only when debug level is greater than 1. + +Fri Dec 10 10:50:00 2004 Richard Frith-Macdonald + + * GNUmakefile: Remove unnecessary libraries from link commands for + bundles. On Darwin, specifying these leads to multiply defined + symbols when an executable attempts to load the bundle. + +Fri Nov 19 14:40:00 2004 Richard Frith-Macdonald + + * WebServer.m: parse basic authentication infor and set it in extra + headers in request. + * WebServerBundles.m: support handling of paths longer than the + ones set for each bundle. + +Tue Nov 11 14:48:05 2004 Nicola Pero + + * GNUmakefile (BUNDLE_INSTALL_DIR): install bundles in + GNUSTEP_INSTALLATION_DIR, not GNUSTEP_LOCAL_ROOT. + +Tue Nov 09 10:20:00 2004 Richard Frith-Macdonald + + * SQLClient.hm: add ([-append:]) method to merge transactions. + +Thu Oct 28 08:45:00 2004 Richard Frith-Macdonald + + * WebServer.m: Don't generate alert about connection with empty + request if we have lready handled a request and reset. + +Tue Oct 26 16:50:00 2004 Richard Frith-Macdonald + + * SQLClient.m: debug and duration logging should be turned off + by default ... a different value crept in somehow. + +Sat Oct 9 14:29:35 2004 Nicola Pero + + * SQLClient.m ([SQLClient -simpleExecute:]): Fixed logging + durations and statements in transactions. + +Thu Oct 08 10:30:00 2004 Richard Frith-Macdonald + + * SQLClient.[hm]: Add ([-quotef:,...]) to perform efficient quoting + of a string produced using printf style format and arguments. + +Thu Oct 07 10:30:00 2004 Richard Frith-Macdonald + + * SQLClient.[hm]: Optimise timing operations somewhat. + +Wed Oct 06 15:04:23 2004 Nicola Pero + + * WebServer.h: Fixed typo in parameter name. + +Wed Oct 06 13:10:00 2004 Richard Frith-Macdonald + + * SQLClient.[hm]: Allow a database transaction to already have been + begun when [SQLTransactiuon-execute] is called, so we can have + queries in the same database transaction as a list of statements. + +Wed Oct 06 06:15:00 2004 Richard Frith-Macdonald + + * SQLClient.[hm]: Make the rollback opoeration a safe no-op if + there is no transaction in progress. + * Postgres.m: Improve exception text by reporting the offending + SQL statement(s). + +Fri Sep 17 16:55:00 2004 Richard Frith-Macdonald + + * SQLClient.[hm]: When reporting the duration of a commit or + rollback, report text of all the statements in the transaction. + +Fri Aug 28 09:30:00 2004 Richard Frith-Macdonald + + * WebServer.[hm]: Add support for limiting maximum number of incoming + sessions permitted from mone host. + +Tue Aug 24 14:30:00 2004 Richard Frith-Macdonald + + * WebServer.[hm]: Add support for HTTP/1.1 persistent connections. + +Sun Aug 22 10:35:00 2004 Richard Frith-Macdonald + + * SQLClient.[hm]: Add ([SQLRecord-dictionary]) and tidy/comment the + class a bit better. + +Sat Aug 07 14:25:00 2004 Richard Frith-Macdonald + + * WebServer.m: Add session timeouts to kill off idle sessions. + +Tue Jul 27 17:30:00 2004 Richard Frith-Macdonald + + * configure.ac: Give more help when postgres is not found. + * configure: regenerate + +Mon Jul 26 09:50:00 2004 Richard Frith-Macdonald + + * SQLClient.h: Add -transaction method and SQLTransaction class + * SQLClient.m: Implement -transaction method and SQLTransaction class + to provide a simple convenient mechanism for executing a sequence + of statements as a single transaction. + +Thu Jul 15 09:40:00 2004 Richard Frith-Macdonald + + * WebServer.m: ([_didRead:]) more informative logging upon reading + an unexpected end-of-file + +Wed Jul 14 12:07:00 2004 Richard Frith-Macdonald + + * configure.ac: Check for PQfformat in libpq, if it is not there + but the library is there, warn that it is too old. + +Thu Jul 02 17:40:00 2004 Richard Frith-Macdonald + + * WebServer.m: Add control over character encoding used to + interpret form data. + +Thu Jul 02 13:25:00 2004 Richard Frith-Macdonald + + * WebServer.m: Fix error response when an exception occurs. + +Thu Jul 01 18:00:00 2004 Richard Frith-Macdonald + + * WebServer.m: Make ([setPort:secure:]) return a status. + * WebServerBundles.m: Check that web server is able to start. + * WebServer.h: ditto + +Wed Jun 30 05:40:00 2004 Richard Frith-Macdonald + + * GNUmakefile: Use ./obj as location for library to link, + for initial case where we link the bundles before installing + the library. + * WebServer.m: Add casts to prevent compiler warning. + * Postgres.m: Commented out NSLog() left over from debugging. + +Tue Jun 29 18:10:00 2004 Richard Frith-Macdonald + + * SQLClient.m: Fix code for retrieving reference name ... look in + the config dictionary first, and in user defaults if not found + there. + * SQLClient.h: Document change. + * GNUmakefile: Link bundles with the library to ensure that they + find the SQLRecord class when loaded. + +Mon Jun 28 12:55:00 2004 Richard Frith-Macdonald + + * WebServer.h: New file. + * WebServer.m: New file. + * WebServerBundles.m: New file. + * SQLClient.h: Mention WebServer. + * GNUmakefile: Build WebServer classes. + Added framework to make it easy to use SQLClient to produce + standalone http/https applications, such as accepting POST'ed + records for addition to a database. + +Fri May 07 09:15:00 2004 Richard Frith-Macdonald + + Add methods to log duration of any statements over a certain + limit. + Tidy instance variables ... prefix mprivate ones with underscore. + Install header! + +Thu Apr 29 15:20:00 2004 Richard Frith-Macdonald + + * SQLClient.h: Fix URLs in documentation as suggested by Adam. + * SQLClient.html: regenerate + +Mon Apr 26 16:20:00 2004 Richard Frith-Macdonald + + Initial checkin of library. 2009-10-01 Richard Frith-Macdonald * configure.ac: workaround autoconf bug. diff --git a/ECPG.pgm b/ECPG.pgm index b8e6edb..ab467f6 100644 --- a/ECPG.pgm +++ b/ECPG.pgm @@ -276,7 +276,7 @@ static NSDate *future = nil; /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { RELEASE (arp); [NSException raise: SQLException @@ -296,7 +296,7 @@ static NSDate *future = nil; if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } /* * remove line number information from database exception message @@ -399,7 +399,7 @@ static unsigned int trim(char *str) /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { RELEASE (arp); [NSException raise: SQLException @@ -640,14 +640,14 @@ static unsigned int trim(char *str) if ([e isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } } NS_ENDHANDLER if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } /* diff --git a/JDBC.m b/JDBC.m index 481f35b..dfce76f 100644 --- a/JDBC.m +++ b/JDBC.m @@ -1164,7 +1164,7 @@ static int JDBCVARCHAR = 0; /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to execute statement %@", @@ -1277,7 +1277,7 @@ static int JDBCVARCHAR = 0; /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to run query %@", @@ -1498,7 +1498,7 @@ static int JDBCVARCHAR = 0; (*env)->PopLocalFrame (env, NULL); if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if ([self debugging] > 0) { @@ -1579,7 +1579,7 @@ static int JDBCVARCHAR = 0; - (void) dealloc { - [self backendDisconnect]; + [self disconnect]; [super dealloc]; } @@ -1739,7 +1739,7 @@ static int JDBCVARCHAR = 0; /* * Ensure we have a working connection. */ - if ([_db backendConnect] == NO) + if ([_db connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to execute transaction %@", diff --git a/MySQL.m b/MySQL.m index 30472b8..a8a14fc 100644 --- a/MySQL.m +++ b/MySQL.m @@ -198,7 +198,7 @@ static NSNull *null = nil; /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to execute statement %@", @@ -226,7 +226,7 @@ static NSNull *null = nil; if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if ([self debugging] > 0) { @@ -288,7 +288,7 @@ static unsigned int trim(char *str) /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to run query %@", @@ -433,7 +433,7 @@ static unsigned int trim(char *str) if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if ([self debugging] > 0) { diff --git a/Oracle.pm b/Oracle.pm index c3f6073..35253f6 100644 --- a/Oracle.pm +++ b/Oracle.pm @@ -240,7 +240,7 @@ void SQLClientOracleErrorHandler() /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"(Oracle) Unable to connect to database"]; @@ -273,7 +273,7 @@ void SQLClientOracleErrorHandler() if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } /* * remove line number information from database exception message @@ -368,7 +368,7 @@ static unsigned int trim(char *str) /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"(Oracle) Unable to connect to database"]; @@ -644,7 +644,7 @@ static unsigned int trim(char *str) } if ([e isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } } NS_ENDHANDLER @@ -667,7 +667,7 @@ static unsigned int trim(char *str) if ([n isEqual: SQLConnectionException] == YES) { _inTransaction = NO; - [self backendDisconnect]; + [self disconnect]; } /* diff --git a/Postgres.m b/Postgres.m index b8fa6dc..d8ee7f3 100644 --- a/Postgres.m +++ b/Postgres.m @@ -268,7 +268,7 @@ connectQuote(NSString *str) /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to execute statement %@", @@ -299,7 +299,7 @@ connectQuote(NSString *str) cstr = PQresultErrorMessage(result); } str = [NSString stringWithUTF8String: cstr]; - [self backendDisconnect]; + [self disconnect]; [NSException raise: SQLException format: @"Error executing %@: %@", stmt, str]; } @@ -315,7 +315,7 @@ connectQuote(NSString *str) if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if (result != 0) { @@ -380,7 +380,7 @@ static unsigned int trim(char *str) /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to run query %@", @@ -403,7 +403,7 @@ static unsigned int trim(char *str) cstr = PQresultErrorMessage(result); } str = [NSString stringWithUTF8String: cstr]; - [self backendDisconnect]; + [self disconnect]; [NSException raise: SQLException format: @"Error executing %@: %@", stmt, str]; } @@ -507,7 +507,7 @@ static unsigned int trim(char *str) if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if (result != 0) { @@ -808,7 +808,7 @@ static unsigned int trim(char *str) { if (extra != 0) { - [self backendDisconnect]; + [self disconnect]; NSZoneFree(NSDefaultMallocZone(), extra); } [super dealloc]; @@ -823,7 +823,7 @@ static unsigned int trim(char *str) #ifdef HAVE_PQESCAPESTRINGCONN int err; - [self backendConnect]; + [self connect]; l = PQescapeStringConn(connection, (char*)(to + 1), [d bytes], l, &err); #else l = PQescapeString(to + 1, [d bytes], l); diff --git a/SQLite.m b/SQLite.m index 27866f7..0882ead 100644 --- a/SQLite.m +++ b/SQLite.m @@ -151,7 +151,7 @@ /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to execute statement %@", @@ -179,7 +179,7 @@ if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if ([self debugging] > 0) { @@ -219,7 +219,7 @@ /* * Ensure we have a working connection. */ - if ([self backendConnect] == NO) + if ([self connect] == NO) { [NSException raise: SQLException format: @"Unable to connect to '%@' to run query %@", @@ -305,7 +305,7 @@ if ([n isEqual: SQLConnectionException] == YES) { - [self backendDisconnect]; + [self disconnect]; } if ([self debugging] > 0) {