Add SL3OpenFailedException
FossilOrigin-Name: 26a83e91f0807f2af6b7b95b33482e55c12ddd3365db835ed7d05e68738a399f
This commit is contained in:
parent
2dee05041f
commit
f9bc4936e4
6 changed files with 133 additions and 6 deletions
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#import "SL3Connection.h"
|
#import "SL3Connection.h"
|
||||||
|
|
||||||
#import "SL3Exception.h"
|
#import "SL3OpenFailedException.h"
|
||||||
|
|
||||||
@implementation SL3Connection
|
@implementation SL3Connection
|
||||||
+ (instancetype)connectionWithPath: (OFString *)path
|
+ (instancetype)connectionWithPath: (OFString *)path
|
||||||
|
@ -42,9 +42,9 @@
|
||||||
flags, NULL);
|
flags, NULL);
|
||||||
|
|
||||||
if (errorCode != SQLITE_OK)
|
if (errorCode != SQLITE_OK)
|
||||||
/* TODO: Use an SL3Exception subclass. */
|
@throw [SL3OpenFailedException
|
||||||
@throw [SL3Exception
|
exceptionWithPath: path
|
||||||
exceptionWithConnection: nil
|
flags: flags
|
||||||
errorCode: errorCode];
|
errorCode: errorCode];
|
||||||
} @catch (id e) {
|
} @catch (id e) {
|
||||||
[self release];
|
[self release];
|
||||||
|
|
|
@ -3,7 +3,8 @@ include ../../extra.mk
|
||||||
STATIC_PIC_LIB_NOINST = ${EXCEPTIONS_LIB_A}
|
STATIC_PIC_LIB_NOINST = ${EXCEPTIONS_LIB_A}
|
||||||
STATIC_LIB_NOINST = ${EXCEPTIONS_A}
|
STATIC_LIB_NOINST = ${EXCEPTIONS_A}
|
||||||
|
|
||||||
SRCS = SL3Exception.m
|
SRCS = SL3Exception.m \
|
||||||
|
SL3OpenFailedException.m
|
||||||
|
|
||||||
INCLUDES = ${SRCS:.m=.h}
|
INCLUDES = ${SRCS:.m=.h}
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,10 @@ OF_ASSUME_NONNULL_BEGIN
|
||||||
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) SL3Connection *connection;
|
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) SL3Connection *connection;
|
||||||
@property (readonly, nonatomic) int errorCode;
|
@property (readonly, nonatomic) int errorCode;
|
||||||
|
|
||||||
|
+ (instancetype)exception OF_UNAVAILABLE;
|
||||||
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
|
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
|
||||||
errorCode: (int)errorCode;
|
errorCode: (int)errorCode;
|
||||||
|
- (instancetype)init OF_UNAVAILABLE;
|
||||||
- (instancetype)initWithConnection: (nullable SL3Connection *)connection
|
- (instancetype)initWithConnection: (nullable SL3Connection *)connection
|
||||||
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
|
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -25,6 +25,11 @@
|
||||||
@implementation SL3Exception
|
@implementation SL3Exception
|
||||||
@synthesize connection = _connection, errorCode = _errorCode;
|
@synthesize connection = _connection, errorCode = _errorCode;
|
||||||
|
|
||||||
|
+ (instancetype)exception
|
||||||
|
{
|
||||||
|
OF_UNRECOGNIZED_SELECTOR
|
||||||
|
}
|
||||||
|
|
||||||
+ (instancetype)exceptionWithConnection: (SL3Connection *)connection
|
+ (instancetype)exceptionWithConnection: (SL3Connection *)connection
|
||||||
errorCode: (int)errorCode
|
errorCode: (int)errorCode
|
||||||
{
|
{
|
||||||
|
@ -32,6 +37,11 @@
|
||||||
errorCode: errorCode] autorelease];
|
errorCode: errorCode] autorelease];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (instancetype)init
|
||||||
|
{
|
||||||
|
OF_INVALID_INIT_METHOD
|
||||||
|
}
|
||||||
|
|
||||||
- (instancetype)initWithConnection: (SL3Connection *)connection
|
- (instancetype)initWithConnection: (SL3Connection *)connection
|
||||||
errorCode: (int)errorCode
|
errorCode: (int)errorCode
|
||||||
{
|
{
|
||||||
|
|
48
src/exceptions/SL3OpenFailedException.h
Normal file
48
src/exceptions/SL3OpenFailedException.h
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||||
|
*
|
||||||
|
* https://fossil.nil.im/objsqlite3
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
* copyright notice and this permission notice is present in all copies.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import "SL3Exception.h"
|
||||||
|
|
||||||
|
OF_ASSUME_NONNULL_BEGIN
|
||||||
|
|
||||||
|
@interface SL3OpenFailedException: SL3Exception
|
||||||
|
{
|
||||||
|
OFString *_path;
|
||||||
|
int _flags;
|
||||||
|
}
|
||||||
|
|
||||||
|
@property (readonly, nonatomic) OFString *path;
|
||||||
|
@property (readonly, nonatomic) int flags;
|
||||||
|
|
||||||
|
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
|
||||||
|
errorCode: (int)errorCode OF_UNAVAILABLE;
|
||||||
|
+ (instancetype)exceptionWithPath: (OFString *)path
|
||||||
|
flags: (int)flags
|
||||||
|
errorCode: (int)errorCode;
|
||||||
|
- (instancetype)initWithConnection: (nullable SL3Connection *)connection
|
||||||
|
errorCode: (int)errorCode OF_UNAVAILABLE;
|
||||||
|
- (instancetype)initWithPath: (OFString *)path
|
||||||
|
flags: (int)flags
|
||||||
|
errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
|
||||||
|
@end
|
||||||
|
|
||||||
|
OF_ASSUME_NONNULL_END
|
66
src/exceptions/SL3OpenFailedException.m
Normal file
66
src/exceptions/SL3OpenFailedException.m
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||||
|
*
|
||||||
|
* https://fossil.nil.im/objsqlite3
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
|
* purpose with or without fee is hereby granted, provided that the above
|
||||||
|
* copyright notice and this permission notice is present in all copies.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||||
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||||
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||||
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||||
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import "SL3OpenFailedException.h"
|
||||||
|
|
||||||
|
@implementation SL3OpenFailedException
|
||||||
|
@synthesize path = _Path, flags = _flags;
|
||||||
|
|
||||||
|
+ (instancetype)exceptionWithConnection: (SL3Connection *)connection
|
||||||
|
errorCode: (int)errorCode OF_UNAVAILABLE
|
||||||
|
{
|
||||||
|
OF_UNRECOGNIZED_SELECTOR
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (instancetype)exceptionWithPath: (OFString *)path
|
||||||
|
flags: (int)flags
|
||||||
|
errorCode: (int)errorCode
|
||||||
|
{
|
||||||
|
return [[[self alloc] initWithPath: path
|
||||||
|
flags: flags
|
||||||
|
errorCode: errorCode] autorelease];
|
||||||
|
}
|
||||||
|
|
||||||
|
- (instancetype)initWithConnection: (SL3Connection *)connection
|
||||||
|
errorCode: (int)errorCode OF_UNAVAILABLE
|
||||||
|
{
|
||||||
|
OF_INVALID_INIT_METHOD
|
||||||
|
}
|
||||||
|
|
||||||
|
- (instancetype)initWithPath: (OFString *)path
|
||||||
|
flags: (int)flags
|
||||||
|
errorCode: (int)errorCode
|
||||||
|
{
|
||||||
|
self = [super initWithConnection: nil
|
||||||
|
errorCode: errorCode];
|
||||||
|
|
||||||
|
@try {
|
||||||
|
_path = [path copy];
|
||||||
|
_flags = flags;
|
||||||
|
} @catch (id e) {
|
||||||
|
[self release];
|
||||||
|
@throw e;
|
||||||
|
}
|
||||||
|
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
@end
|
Loading…
Add table
Add a link
Reference in a new issue