ObjFW/ObjSQLite3
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Rename SL3Statement -> SL3PreparedStatement

Browse source 
FossilOrigin-Name: 4fc7a99ac98531e4bc6252a53c4a08277e32c62c01fa7593c1d0f24001d974fe
This commit is contained in:
Jonathan Schleifer 2020-10-01 21:16:18 +00:00
parent b5c94b74db
commit b1edabd532
13 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile
View file

@ -8,8 +8,8 @@ FRAMEWORK = ${OBJSQLITE3_FRAMEWORK}
LIB_MAJOR = 0 LIB_MAJOR = 0
LIB_MINOR = 0 LIB_MINOR = 0
SRCS = SL3Connection.m \ SRCS = SL3Connection.m \
SL3Statement.m SL3PreparedStatement.m
INCLUDES := ${SRCS:.m=.h} \ INCLUDES := ${SRCS:.m=.h} \
ObjSQLite3.h ObjSQLite3.h

1
src/ObjSQLite3.h
View file

@ -21,3 +21,4 @@
*/ */
#import "SL3Connection.h" #import "SL3Connection.h"
#import "SL3PreparedStatement.h"

4
src/SL3Statement+Private.h → src/SL3PreparedStatement+Private.h
View file

@ -20,11 +20,11 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import "SL3Statement.h" #import "SL3PreparedStatement.h"
OF_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
@interface SL3Statement () @interface SL3PreparedStatement ()
- (instancetype)sl3_initWithConnection: (SL3Connection *)connection - (instancetype)sl3_initWithConnection: (SL3Connection *)connection
SQLStatement: (OFConstantString *)SQLStatement; SQLStatement: (OFConstantString *)SQLStatement;
@end @end

2
src/SL3Statement.h → src/SL3PreparedStatement.h
View file

@ -28,7 +28,7 @@ OF_ASSUME_NONNULL_BEGIN
@class SL3Connection; @class SL3Connection;
@interface SL3Statement: OFObject @interface SL3PreparedStatement: OFObject
{ {
#ifdef SL3_PUBLIC_IVARS #ifdef SL3_PUBLIC_IVARS
@public @public

8
src/SL3Statement.m → src/SL3PreparedStatement.m
View file

@ -20,8 +20,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#import "SL3Statement.h" #import "SL3PreparedStatement.h"
#import "SL3Statement+Private.h" #import "SL3PreparedStatement+Private.h"
#import "SL3BindObjectFailedException.h" #import "SL3BindObjectFailedException.h"
#import "SL3ClearBindingsFailedException.h" #import "SL3ClearBindingsFailedException.h"
@ -35,7 +35,7 @@ releaseObject(void *object)
[(id)object release]; [(id)object release];
} }
@implementation SL3Statement @implementation SL3PreparedStatement
- (instancetype)sl3_initWithConnection: (SL3Connection *)connection - (instancetype)sl3_initWithConnection: (SL3Connection *)connection
SQLStatement: (OFConstantString *)SQLStatement SQLStatement: (OFConstantString *)SQLStatement
{ {
@ -70,7 +70,7 @@ releaseObject(void *object)
} }
static void static void
bindObject(SL3Statement *statement, int column, id object) bindObject(SL3PreparedStatement *statement, int column, id object)
{ {
int code; int code;

10
src/exceptions/SL3BindObjectFailedException.h
View file

@ -22,7 +22,7 @@
#import "SL3Exception.h" #import "SL3Exception.h"
#import "SL3Statement.h" #import "SL3PreparedStatement.h"
OF_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
@ -30,24 +30,24 @@ OF_ASSUME_NONNULL_BEGIN
{ {
id _object; id _object;
int _column; int _column;
SL3Statement *_statement; SL3PreparedStatement *_statement;
} }
@property (readonly, nonatomic) id object; @property (readonly, nonatomic) id object;
@property (readonly, nonatomic) int column; @property (readonly, nonatomic) int column;
@property (readonly, nonatomic) SL3Statement *statement; @property (readonly, nonatomic) SL3PreparedStatement *statement;
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection + (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
+ (instancetype)exceptionWithObject: (id)object + (instancetype)exceptionWithObject: (id)object
column: (int)column column: (int)column
statement: (SL3Statement *)statement statement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode; errorCode: (int)errorCode;
- (instancetype)initWithConnection: (nullable SL3Connection *)connection - (instancetype)initWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
- (instancetype)initWithObject: (id)object - (instancetype)initWithObject: (id)object
column: (int)column column: (int)column
statement: (SL3Statement *)statement statement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER; errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
@end @end

4
src/exceptions/SL3BindObjectFailedException.m
View file

@ -33,7 +33,7 @@
+ (instancetype)exceptionWithObject: (id)object + (instancetype)exceptionWithObject: (id)object
column: (int)column column: (int)column
statement: (SL3Statement *)statement statement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
return [[[self alloc] initWithObject: object return [[[self alloc] initWithObject: object
@ -50,7 +50,7 @@
- (instancetype)initWithObject: (id)object - (instancetype)initWithObject: (id)object
column: (int)column column: (int)column
statement: (SL3Statement *)statement statement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
self = [super initWithConnection: statement->_connection self = [super initWithConnection: statement->_connection

10
src/exceptions/SL3ClearBindingsFailedException.h
View file

@ -22,24 +22,24 @@
#import "SL3Exception.h" #import "SL3Exception.h"
#import "SL3Statement.h" #import "SL3PreparedStatement.h"
OF_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
@interface SL3ClearBindingsFailedException: SL3Exception @interface SL3ClearBindingsFailedException: SL3Exception
{ {
SL3Statement *_statement; SL3PreparedStatement *_statement;
} }
@property (readonly, nonatomic) SL3Statement *statement; @property (readonly, nonatomic) SL3PreparedStatement *statement;
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection + (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
+ (instancetype)exceptionWithStatement: (SL3Statement *)statement + (instancetype)exceptionWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode; errorCode: (int)errorCode;
- (instancetype)initWithConnection: (nullable SL3Connection *)connection - (instancetype)initWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
- (instancetype)initWithStatement: (SL3Statement *)statement - (instancetype)initWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER; errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
@end @end

4
src/exceptions/SL3ClearBindingsFailedException.m
View file

@ -31,7 +31,7 @@
OF_UNRECOGNIZED_SELECTOR OF_UNRECOGNIZED_SELECTOR
} }
+ (instancetype)exceptionWithStatement: (SL3Statement *)statement + (instancetype)exceptionWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
return [[[self alloc] initWithStatement: statement return [[[self alloc] initWithStatement: statement
@ -44,7 +44,7 @@
OF_INVALID_INIT_METHOD OF_INVALID_INIT_METHOD
} }
- (instancetype)initWithStatement: (SL3Statement *)statement - (instancetype)initWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
self = [super initWithConnection: statement->_connection self = [super initWithConnection: statement->_connection

10
src/exceptions/SL3ExecuteStatementFailedException.h
View file

@ -22,24 +22,24 @@
#import "SL3Exception.h" #import "SL3Exception.h"
#import "SL3Statement.h" #import "SL3PreparedStatement.h"
OF_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
@interface SL3ExecuteStatementFailedException: SL3Exception @interface SL3ExecuteStatementFailedException: SL3Exception
{ {
SL3Statement *_statement; SL3PreparedStatement *_statement;
} }
@property (readonly, nonatomic) SL3Statement *statement; @property (readonly, nonatomic) SL3PreparedStatement *statement;
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection + (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
+ (instancetype)exceptionWithStatement: (SL3Statement *)statement + (instancetype)exceptionWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode; errorCode: (int)errorCode;
- (instancetype)initWithConnection: (nullable SL3Connection *)connection - (instancetype)initWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
- (instancetype)initWithStatement: (SL3Statement *)statement - (instancetype)initWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER; errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
@end @end

4
src/exceptions/SL3ExecuteStatementFailedException.m
View file

@ -31,7 +31,7 @@
OF_UNRECOGNIZED_SELECTOR OF_UNRECOGNIZED_SELECTOR
} }
+ (instancetype)exceptionWithStatement: (SL3Statement *)statement + (instancetype)exceptionWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
return [[[self alloc] initWithStatement: statement return [[[self alloc] initWithStatement: statement
@ -44,7 +44,7 @@
OF_INVALID_INIT_METHOD OF_INVALID_INIT_METHOD
} }
- (instancetype)initWithStatement: (SL3Statement *)statement - (instancetype)initWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
self = [super initWithConnection: statement->_connection self = [super initWithConnection: statement->_connection

10
src/exceptions/SL3ResetStatementFailedException.h
View file

@ -22,24 +22,24 @@
#import "SL3Exception.h" #import "SL3Exception.h"
#import "SL3Statement.h" #import "SL3PreparedStatement.h"
OF_ASSUME_NONNULL_BEGIN OF_ASSUME_NONNULL_BEGIN
@interface SL3ResetStatementFailedException: SL3Exception @interface SL3ResetStatementFailedException: SL3Exception
{ {
SL3Statement *_statement; SL3PreparedStatement *_statement;
} }
@property (readonly, nonatomic) SL3Statement *statement; @property (readonly, nonatomic) SL3PreparedStatement *statement;
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection + (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
+ (instancetype)exceptionWithStatement: (SL3Statement *)statement + (instancetype)exceptionWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode; errorCode: (int)errorCode;
- (instancetype)initWithConnection: (nullable SL3Connection *)connection - (instancetype)initWithConnection: (nullable SL3Connection *)connection
errorCode: (int)errorCode OF_UNAVAILABLE; errorCode: (int)errorCode OF_UNAVAILABLE;
- (instancetype)initWithStatement: (SL3Statement *)statement - (instancetype)initWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER; errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
@end @end

4
src/exceptions/SL3ResetStatementFailedException.m
View file

@ -31,7 +31,7 @@
OF_UNRECOGNIZED_SELECTOR OF_UNRECOGNIZED_SELECTOR
} }
+ (instancetype)exceptionWithStatement: (SL3Statement *)statement + (instancetype)exceptionWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
return [[[self alloc] initWithStatement: statement return [[[self alloc] initWithStatement: statement
@ -44,7 +44,7 @@
OF_INVALID_INIT_METHOD OF_INVALID_INIT_METHOD
} }
- (instancetype)initWithStatement: (SL3Statement *)statement - (instancetype)initWithStatement: (SL3PreparedStatement *)statement
errorCode: (int)errorCode errorCode: (int)errorCode
{ {
self = [super initWithConnection: statement->_connection self = [super initWithConnection: statement->_connection