Author: rfm
Date: Fri Apr 28 10:37:59 2017
New Revision: 40495
URL: http://svn.gna.org/viewcvs/gnustep?rev=40495&view=rev
Log:
make -simpleExecute: easier to use.
Modified:
libs/sqlclient/trunk/SQLClient.h
libs/sqlclient/trunk/SQLClient.m
Modified: libs/sqlclient/trunk/SQLClient.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClient.h?rev=40495&r1=40494&r2=40495&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClient.h (original)
+++ libs/sqlclient/trunk/SQLClient.h Fri Apr 28 10:37:59 2017
@@ -1016,9 +1016,11 @@
* Calls -backendExecute: in a safe manner.<br />
* Handles locking.<br />
* Maintains -lastOperation date.<br />
- * Returns the result of -backendExecute:
- */
-- (NSInteger) simpleExecute: (NSArray*)info;
+ * Returns the result of the -backendExecute: method call.<br />
+ * Accepts a mutable array argument (as produced by the prepare methods)
+ * or a simple SQL statement (a string), otherwise raises an exception.
+ */
+- (NSInteger) simpleExecute: (id)info;
/**
* Calls -simpleQuery:recordType:listType: with the default record class
Modified: libs/sqlclient/trunk/SQLClient.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClient.m?rev=40495&r1=40494&r2=40495&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClient.m (original)
+++ libs/sqlclient/trunk/SQLClient.m Fri Apr 28 10:37:59 2017
@@ -2441,10 +2441,23 @@
[lock unlock];
}
-- (NSInteger) simpleExecute: (NSArray*)info
+- (NSInteger) simpleExecute: (id)info
{
NSInteger result;
NSString *debug = nil;
+
+ if ([info isKindOfClass: NSArrayClass] == NO)
+ {
+ if ([info isKindOfClass: NSStringClass] == NO)
+ {
+ [NSException raise: NSInvalidArgumentException
+ format: @"[%@ -simpleExecute: %@ (class %@)]",
+ NSStringFromClass([self class]),
+ info,
+ NSStringFromClass([info class])];
+ }
+ info = [NSMutableArray arrayWithObject: info];
+ }
[lock lock];
NS_DURING
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
