gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-11 08:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove some redundant code

Browse source
This commit is contained in:
Richard Frith-Macdonald 2020-02-11 15:32:49 +00:00
parent bb47241044
commit 94f644590a
4 changed files with 12 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2020-02-11 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.h: Remove redundant -prepareQuery: method.
* SQLClient.m: Remove redundant -prepareQuery: method and redundant
code from query building methods.
* SQLClientPool.m: Remove redundant -prepareQuery: method and redundant
code from query building methods.
2020-01-22 Richard Frith-Macdonald <rfm@gnu.org>
* Postgres.m: Fix notification posting to refrain from coalescing.

6
SQLClient.h
View file

@ -876,11 +876,6 @@ SQLCLIENT_PRIVATE
*/
- (NSMutableArray*) prepare: (NSString*)stmt, ...;
/** Builds a query by calling [SQLClient-prepare:args:] where the argument
* list needs to be nil terminated list of objects.
*/
- (SQLLiteral*) prepareQuery: (NSString*)stmt, ...;
/**
* This is the method used to convert a query or statement to a standard
* form used internally by other methods.<br />
@ -1921,7 +1916,6 @@ typedef struct _SQLClientPoolItem SQLClientPoolItem;
- (NSMutableArray*) prepare: (NSString*)stmt, ...;
- (NSMutableArray*) prepare: (NSString*)stmt args: (va_list)args;
- (NSMutableArray*) prepare: (NSString*)stmt with: (NSDictionary*)values;
- (SQLLiteral*) prepareQuery: (NSString*)stmt, ...;
- (NSMutableArray*) query: (NSString*)stmt,...;
- (NSMutableArray*) query: (NSString*)stmt with: (NSDictionary*)values;
- (SQLRecord*) queryRecord: (NSString*)stmt,...;

12
SQLClient.m
View file

@ -1852,18 +1852,6 @@ static int poolConnections = 0;
return result;
}
- (SQLLiteral*) prepareQuery: (NSString*)stmt, ...
{
va_list ap;
NSMutableArray *result;
va_start (ap, stmt);
result = [self prepare: stmt args: ap];
va_end (ap);
NSAssert([result count] == 1, NSInvalidArgumentException);
return [result objectAtIndex: 0];
}
- (NSMutableArray*) prepare: (NSString*)stmt args: (va_list)args
{
NSMutableArray *ma = [NSMutableArray arrayWithCapacity: 2];

28
SQLClientPool.m
View file

@ -1017,7 +1017,7 @@ static Class cls = Nil;
- (SQLLiteral*) buildQuery: (NSString*)stmt, ...
{
NSString *sql;
SQLLiteral *sql;
va_list ap;
/*
@ -1027,24 +1027,16 @@ static Class cls = Nil;
sql = [[_items[0].c prepare: stmt args: ap] objectAtIndex: 0];
va_end (ap);
if ([sql length] < 1000)
{
return SQLClientMakeLiteral(sql);
}
return SQLClientProxyLiteral(sql);
return sql;
}
- (SQLLiteral*) buildQuery: (NSString*)stmt with: (NSDictionary*)values
{
NSString *sql;
SQLLiteral *sql;
sql = [_items[0].c buildQuery: stmt with: values];
if ([sql length] < 1000)
{
return SQLClientMakeLiteral(sql);
}
return SQLClientProxyLiteral(sql);
return sql;
}
- (NSMutableArray*) cacheCheckSimpleQuery: (NSString*)stmt
@ -1206,18 +1198,6 @@ static Class cls = Nil;
return [_items[0].c prepare: stmt with: values];
}
- (SQLLiteral*) prepareQuery: (NSString*)stmt, ...
{
va_list ap;
NSMutableArray *result;
va_start (ap, stmt);
result = [_items[0].c prepare: stmt args: ap];
va_end (ap);
NSAssert([result count] == 1, NSInvalidArgumentException);
return SQLClientProxyLiteral([result objectAtIndex: 0]);
}
- (NSMutableArray*) query: (NSString*)stmt, ...
{
SQLClient *db;