ObjSQLite3  Check-in [26a83e91f0]

Overview
Comment:Add SL3OpenFailedException
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 26a83e91f0807f2af6b7b95b33482e55c12ddd3365db835ed7d05e68738a399f
User & Date: js on 2020-08-31 22:19:00
Other Links: manifest | tags
Context
2020-09-01
01:43
Add SL3Statement check-in: cc03d24ff3 user: js tags: trunk
2020-08-31
22:19
Add SL3OpenFailedException check-in: 26a83e91f0 user: js tags: trunk
21:44
Add .fossil-settings/ignore-glob check-in: 900c5d0895 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SL3Connection.m from [05894e3c52] to [52eb0ef56e].

︙︙
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

48
49
50
51
52
53
54
55

 * 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 "SL3Connection.h"

#import "SL3Exception.h"

@implementation SL3Connection
+ (instancetype)connectionWithPath: (OFString *)path
			     flags: (int)flags
{
	return [[[self alloc] initWithPath: path
				     flags: flags] autorelease];
}

- (instancetype)initWithPath: (OFString *)path
		       flags: (int)flags
{
	self = [super init];

	@try {
		int errorCode = sqlite3_open_v2(path.UTF8String, &_database,
		    flags, NULL);

		if (errorCode != SQLITE_OK)
			/* TODO: Use an SL3Exception subclass. */
			@throw [SL3Exception
			    exceptionWithConnection: nil

					  errorCode: errorCode];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}








|



















<
|
|
>
|








18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

45
46
47
48
49
50
51
52
53
54
55

 * 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 "SL3Connection.h"

#import "SL3OpenFailedException.h"

@implementation SL3Connection
+ (instancetype)connectionWithPath: (OFString *)path
			     flags: (int)flags
{
	return [[[self alloc] initWithPath: path
				     flags: flags] autorelease];
}

- (instancetype)initWithPath: (OFString *)path
		       flags: (int)flags
{
	self = [super init];

	@try {
		int errorCode = sqlite3_open_v2(path.UTF8String, &_database,
		    flags, NULL);

		if (errorCode != SQLITE_OK)

			@throw [SL3OpenFailedException
			    exceptionWithPath: path
					flags: flags
				    errorCode: errorCode];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}
︙︙

Modified src/exceptions/Makefile from [1415e43b6a] to [289d424c28]. 

1
2
3
4
5
6

7
8
9
10
11
12

include ../../extra.mk

STATIC_PIC_LIB_NOINST = ${EXCEPTIONS_LIB_A}
STATIC_LIB_NOINST = ${EXCEPTIONS_A}

SRCS = SL3Exception.m


INCLUDES = ${SRCS:.m=.h}

include ../../buildsys.mk

CPPFLAGS += -I. -I..






|
>







1
2
3
4
5
6
7
8
9
10
11
12
13

include ../../extra.mk

STATIC_PIC_LIB_NOINST = ${EXCEPTIONS_LIB_A}
STATIC_LIB_NOINST = ${EXCEPTIONS_A}

SRCS = SL3Exception.m		\
       SL3OpenFailedException.m

INCLUDES = ${SRCS:.m=.h}

include ../../buildsys.mk

CPPFLAGS += -I. -I..

Modified src/exceptions/SL3Exception.h from [cb96ce679b] to [bf0b6819ba].

︙︙
31
32
33
34
35
36
37

38
39

40
41
42
43
44

	SL3Connection *_connection;
	int _errorCode;
}

@property OF_NULLABLE_PROPERTY (readonly, nonatomic) SL3Connection *connection;
@property (readonly, nonatomic) int errorCode;


+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
			      errorCode: (int)errorCode;

- (instancetype)initWithConnection: (nullable SL3Connection *)connection
			 errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
@end

OF_ASSUME_NONNULL_END








>


>






31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

	SL3Connection *_connection;
	int _errorCode;
}

@property OF_NULLABLE_PROPERTY (readonly, nonatomic) SL3Connection *connection;
@property (readonly, nonatomic) int errorCode;

+ (instancetype)exception OF_UNAVAILABLE;
+ (instancetype)exceptionWithConnection: (nullable SL3Connection *)connection
			      errorCode: (int)errorCode;
- (instancetype)init OF_UNAVAILABLE;
- (instancetype)initWithConnection: (nullable SL3Connection *)connection
			 errorCode: (int)errorCode OF_DESIGNATED_INITIALIZER;
@end

OF_ASSUME_NONNULL_END

Modified src/exceptions/SL3Exception.m from [a42eeef0e9] to [78575918ff].

︙︙
20
21
22
23
24
25
26





27
28
29
30
31
32
33





34
35
36
37
38
39
40

 * POSSIBILITY OF SUCH DAMAGE.
 */

#import "SL3Exception.h"

@implementation SL3Exception
@synthesize connection = _connection, errorCode = _errorCode;






+ (instancetype)exceptionWithConnection: (SL3Connection *)connection
			      errorCode: (int)errorCode
{
	return [[[self alloc] initWithConnection: connection
				       errorCode: errorCode] autorelease];
}






- (instancetype)initWithConnection: (SL3Connection *)connection
			 errorCode: (int)errorCode
{
	self = [super init];

	_connection = [connection retain];








>
>
>
>
>







>
>
>
>
>








20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

 * POSSIBILITY OF SUCH DAMAGE.
 */

#import "SL3Exception.h"

@implementation SL3Exception
@synthesize connection = _connection, errorCode = _errorCode;

+ (instancetype)exception
{
	OF_UNRECOGNIZED_SELECTOR
}

+ (instancetype)exceptionWithConnection: (SL3Connection *)connection
			      errorCode: (int)errorCode
{
	return [[[self alloc] initWithConnection: connection
				       errorCode: errorCode] autorelease];
}

- (instancetype)init
{
	OF_INVALID_INIT_METHOD
}

- (instancetype)initWithConnection: (SL3Connection *)connection
			 errorCode: (int)errorCode
{
	self = [super init];

	_connection = [connection retain];
︙︙

Added src/exceptions/SL3OpenFailedException.h version [2b6d1a8086].

Added src/exceptions/SL3OpenFailedException.m version [8e4e26c706].