ObjSQLite3  Check-in [cc03d24ff3]

Overview
Comment:Add SL3Statement
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: cc03d24ff3ef295e0a9769b20587ac48cf5172996c09b5420e59eb4407765d63
User & Date: js on 2020-09-01 01:43:07
Other Links: manifest | tags
Context
2020-09-14
23:40
Add files I forgot to add in the last checkin check-in: 04c7dfdd12 user: js tags: trunk
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
Changes

Modified src/Makefile from [b2a42d910b] to [abbf91e936].

1
2
3
4
5
6
7
8
9
10
11

12
13
14
15
16
17
18
19
20
21
22
23
include ../extra.mk

SUBDIRS = exceptions

SHARED_LIB = ${OBJSQLITE3_SHARED_LIB}
STATIC_LIB = ${OBJSQLITE3_STATIC_LIB}
FRAMEWORK = ${OBJSQLITE3_FRAMEWORK}
LIB_MAJOR = 0
LIB_MINOR = 0

SRCS = SL3Connection.m

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

OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_A}
LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A}

include ../buildsys.mk

CPPFLAGS += -I. -Iexceptions
LD = ${OBJC}
FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
LIBS := ${OBJFW_LIBS} ${LIBS}










|
>








|



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
include ../extra.mk

SUBDIRS = exceptions

SHARED_LIB = ${OBJSQLITE3_SHARED_LIB}
STATIC_LIB = ${OBJSQLITE3_STATIC_LIB}
FRAMEWORK = ${OBJSQLITE3_FRAMEWORK}
LIB_MAJOR = 0
LIB_MINOR = 0

SRCS = SL3Connection.m	\
       SL3Statement.m
INCLUDES := ${SRCS:.m=.h}	\
	    ObjSQLite3.h

OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_A}
LIB_OBJS_EXTRA = ${EXCEPTIONS_EXCEPTIONS_LIB_A}

include ../buildsys.mk

CPPFLAGS += -I. -Iexceptions -DSL3_PUBLIC_IVARS
LD = ${OBJC}
FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
LIBS := ${OBJFW_LIBS} ${LIBS}

Modified src/SL3Connection.h from [d61a9f733e] to [d84285d3b9].

24
25
26
27
28
29
30



31
32
33
34
35
36
37
38

#include <sqlite3.h>

OF_ASSUME_NONNULL_BEGIN

@interface SL3Connection: OFObject
{



	sqlite3 *_database;
}

+ (instancetype)connectionWithPath: (OFString *)path
			     flags: (int)flags;
- (instancetype)initWithPath: (OFString *)path
		       flags: (int)flags;
@end







>
>
>
|







24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

#include <sqlite3.h>

OF_ASSUME_NONNULL_BEGIN

@interface SL3Connection: OFObject
{
#ifdef SL3_PUBLIC_IVARS
@public
#endif
	sqlite3 *_db;
}

+ (instancetype)connectionWithPath: (OFString *)path
			     flags: (int)flags;
- (instancetype)initWithPath: (OFString *)path
		       flags: (int)flags;
@end

Modified src/SL3Connection.m from [52eb0ef56e] to [32a5efa225].

34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63

- (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;
}

- (void)dealloc
{
	sqlite3_close(_database);

	[super dealloc];
}
@end







|
<

|
|
<
|
|










|




34
35
36
37
38
39
40
41

42
43
44

45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61

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

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


		if (code != SQLITE_OK)
			@throw [SL3OpenFailedException exceptionWithPath: path

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

	return self;
}

- (void)dealloc
{
	sqlite3_close(_db);

	[super dealloc];
}
@end

Added src/SL3Statement+Private.h version [92e0d4eb09].

Added src/SL3Statement.h version [497f2f5c61].

Added src/SL3Statement.m version [b353cf7850].

Modified src/exceptions/Makefile from [289d424c28] to [2ec17b93d3].

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..






>
>
|
>
|
>
>





|
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
include ../../extra.mk

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

SRCS = SL3BindObjectFailedException.m		\
       SL3ClearBindingsFailedException.m	\
       SL3Exception.m				\
       SL3ExecuteStatementFailedException.m	\
       SL3OpenFailedException.m			\
       SL3PrepareStatementFailedException.m	\
       SL3ResetStatementFailedException.m

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

include ../../buildsys.mk

CPPFLAGS += -I. -I.. -DSL3_PUBLIC_IVARS

Added src/exceptions/SL3BindObjectFailedException.h version [69fc1918c5].

Added src/exceptions/SL3BindObjectFailedException.m version [c032a975f1].

Added src/exceptions/SL3ClearBindingsFailedException.h version [74886695ae].

Added src/exceptions/SL3ClearBindingsFailedException.m version [16c532bbe5].

Modified src/exceptions/SL3OpenFailedException.m from [8e4e26c706] to [176ed940fa].

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
 * 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







|


|














|







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
 * 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_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_INVALID_INIT_METHOD
}

- (instancetype)initWithPath: (OFString *)path
		       flags: (int)flags
		   errorCode: (int)errorCode
59
60
61
62
63
64
65







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

	return self;
}







@end







>
>
>
>
>
>
>

59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (void)dealloc
{
	[_path release];

	[super dealloc];
}
@end

Added src/exceptions/SL3PrepareStatementFailedException.h version [44fce53579].

Added src/exceptions/SL3PrepareStatementFailedException.m version [7f5b066ab2].

Added src/exceptions/SL3ResetStatementFailedException.h version [db5776d4e0].

Added src/exceptions/SL3ResetStatementFailedException.m version [279a39c96d].