Skip to content

Commit b34c9f5

Browse files
JoshuaWiseJoshuaWise
committed
added new result codes
1 parent 9fc53fe commit b34c9f5

File tree

3 files changed

+68
-28
lines changed

3 files changed

+68
-28
lines changed

‎src/better_sqlite3.cpp

+25-5
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ CS::CS (v8::Isolate * isolate)
209209
SetCode(isolate, SQLITE_WARNING, "SQLITE_WARNING");
210210
SetCode(isolate, SQLITE_ROW, "SQLITE_ROW");
211211
SetCode(isolate, SQLITE_DONE, "SQLITE_DONE");
212+
213+
SetCode(isolate, SQLITE_ERROR_MISSING_COLLSEQ, "SQLITE_ERROR_MISSING_COLLSEQ");
214+
SetCode(isolate, SQLITE_ERROR_RETRY, "SQLITE_ERROR_RETRY");
215+
SetCode(isolate, SQLITE_ERROR_SNAPSHOT, "SQLITE_ERROR_SNAPSHOT");
212216
SetCode(isolate, SQLITE_IOERR_READ, "SQLITE_IOERR_READ");
213217
SetCode(isolate, SQLITE_IOERR_SHORT_READ, "SQLITE_IOERR_SHORT_READ");
214218
SetCode(isolate, SQLITE_IOERR_WRITE, "SQLITE_IOERR_WRITE");
@@ -237,18 +241,31 @@ CS::CS (v8::Isolate * isolate)
237241
SetCode(isolate, SQLITE_IOERR_CONVPATH, "SQLITE_IOERR_CONVPATH");
238242
SetCode(isolate, SQLITE_IOERR_VNODE, "SQLITE_IOERR_VNODE");
239243
SetCode(isolate, SQLITE_IOERR_AUTH, "SQLITE_IOERR_AUTH");
244+
SetCode(isolate, SQLITE_IOERR_BEGIN_ATOMIC, "SQLITE_IOERR_BEGIN_ATOMIC");
245+
SetCode(isolate, SQLITE_IOERR_COMMIT_ATOMIC, "SQLITE_IOERR_COMMIT_ATOMIC");
246+
SetCode(isolate, SQLITE_IOERR_ROLLBACK_ATOMIC, "SQLITE_IOERR_ROLLBACK_ATOMIC");
247+
SetCode(isolate, SQLITE_IOERR_DATA, "SQLITE_IOERR_DATA");
248+
SetCode(isolate, SQLITE_IOERR_CORRUPTFS, "SQLITE_IOERR_CORRUPTFS");
249+
SetCode(isolate, SQLITE_IOERR_IN_PAGE, "SQLITE_IOERR_IN_PAGE");
240250
SetCode(isolate, SQLITE_LOCKED_SHAREDCACHE, "SQLITE_LOCKED_SHAREDCACHE");
251+
SetCode(isolate, SQLITE_LOCKED_VTAB, "SQLITE_LOCKED_VTAB");
241252
SetCode(isolate, SQLITE_BUSY_RECOVERY, "SQLITE_BUSY_RECOVERY");
242253
SetCode(isolate, SQLITE_BUSY_SNAPSHOT, "SQLITE_BUSY_SNAPSHOT");
243254
SetCode(isolate, SQLITE_CANTOPEN_NOTEMPDIR, "SQLITE_CANTOPEN_NOTEMPDIR");
244255
SetCode(isolate, SQLITE_CANTOPEN_ISDIR, "SQLITE_CANTOPEN_ISDIR");
245256
SetCode(isolate, SQLITE_CANTOPEN_FULLPATH, "SQLITE_CANTOPEN_FULLPATH");
246257
SetCode(isolate, SQLITE_CANTOPEN_CONVPATH, "SQLITE_CANTOPEN_CONVPATH");
258+
SetCode(isolate, SQLITE_CANTOPEN_DIRTYWAL, "SQLITE_CANTOPEN_DIRTYWAL");
259+
SetCode(isolate, SQLITE_CANTOPEN_SYMLINK, "SQLITE_CANTOPEN_SYMLINK");
247260
SetCode(isolate, SQLITE_CORRUPT_VTAB, "SQLITE_CORRUPT_VTAB");
261+
SetCode(isolate, SQLITE_CORRUPT_SEQUENCE, "SQLITE_CORRUPT_SEQUENCE");
262+
SetCode(isolate, SQLITE_CORRUPT_INDEX, "SQLITE_CORRUPT_INDEX");
248263
SetCode(isolate, SQLITE_READONLY_RECOVERY, "SQLITE_READONLY_RECOVERY");
249264
SetCode(isolate, SQLITE_READONLY_CANTLOCK, "SQLITE_READONLY_CANTLOCK");
250265
SetCode(isolate, SQLITE_READONLY_ROLLBACK, "SQLITE_READONLY_ROLLBACK");
251266
SetCode(isolate, SQLITE_READONLY_DBMOVED, "SQLITE_READONLY_DBMOVED");
267+
SetCode(isolate, SQLITE_READONLY_CANTINIT, "SQLITE_READONLY_CANTINIT");
268+
SetCode(isolate, SQLITE_READONLY_DIRECTORY, "SQLITE_READONLY_DIRECTORY");
252269
SetCode(isolate, SQLITE_ABORT_ROLLBACK, "SQLITE_ABORT_ROLLBACK");
253270
SetCode(isolate, SQLITE_CONSTRAINT_CHECK, "SQLITE_CONSTRAINT_CHECK");
254271
SetCode(isolate, SQLITE_CONSTRAINT_COMMITHOOK, "SQLITE_CONSTRAINT_COMMITHOOK");
@@ -260,22 +277,25 @@ CS::CS (v8::Isolate * isolate)
260277
SetCode(isolate, SQLITE_CONSTRAINT_UNIQUE, "SQLITE_CONSTRAINT_UNIQUE");
261278
SetCode(isolate, SQLITE_CONSTRAINT_VTAB, "SQLITE_CONSTRAINT_VTAB");
262279
SetCode(isolate, SQLITE_CONSTRAINT_ROWID, "SQLITE_CONSTRAINT_ROWID");
280+
SetCode(isolate, SQLITE_CONSTRAINT_PINNED, "SQLITE_CONSTRAINT_PINNED");
281+
SetCode(isolate, SQLITE_CONSTRAINT_DATATYPE, "SQLITE_CONSTRAINT_DATATYPE");
263282
SetCode(isolate, SQLITE_NOTICE_RECOVER_WAL, "SQLITE_NOTICE_RECOVER_WAL");
264283
SetCode(isolate, SQLITE_NOTICE_RECOVER_ROLLBACK, "SQLITE_NOTICE_RECOVER_ROLLBACK");
284+
SetCode(isolate, SQLITE_NOTICE_RBU, "SQLITE_NOTICE_RBU");
265285
SetCode(isolate, SQLITE_WARNING_AUTOINDEX, "SQLITE_WARNING_AUTOINDEX");
266286
SetCode(isolate, SQLITE_AUTH_USER, "SQLITE_AUTH_USER");
267287
SetCode(isolate, SQLITE_OK_LOAD_PERMANENTLY, "SQLITE_OK_LOAD_PERMANENTLY");
268-
SetCode(isolate, SQLITE_ERROR_MISSING_COLLSEQ, "SQLITE_ERROR_MISSING_COLLSEQ");
288+
SetCode(isolate, SQLITE_OK_SYMLINK, "SQLITE_OK_SYMLINK");
269289
}
270-
#line 141 "./src/util/constants.lzz"
290+
#line 161 "./src/util/constants.lzz"
271291
void CS::SetString (v8::Isolate * isolate, v8::Global <v8::String> & constant, char const * str)
272-
#line 141 "./src/util/constants.lzz"
292+
#line 161 "./src/util/constants.lzz"
273293
{
274294
constant.Reset(isolate, InternalizedFromLatin1(isolate, str));
275295
}
276-
#line 145 "./src/util/constants.lzz"
296+
#line 165 "./src/util/constants.lzz"
277297
void CS::SetCode (v8::Isolate * isolate, int code, char const * str)
278-
#line 145 "./src/util/constants.lzz"
298+
#line 165 "./src/util/constants.lzz"
279299
{
280300
codes.emplace(std::piecewise_construct,
281301
std::forward_as_tuple(code),

‎src/better_sqlite3.hpp

+22-22
Original file line numberDiff line numberDiff line change
@@ -68,49 +68,49 @@ class CS
6868
v8::Local <v8::String> Code (v8::Isolate * isolate, int code);
6969
#line 10 "./src/util/constants.lzz"
7070
explicit CS (v8::Isolate * isolate);
71-
#line 120 "./src/util/constants.lzz"
71+
#line 140 "./src/util/constants.lzz"
7272
v8::Global <v8::String> database;
73-
#line 121 "./src/util/constants.lzz"
73+
#line 141 "./src/util/constants.lzz"
7474
v8::Global <v8::String> reader;
75-
#line 122 "./src/util/constants.lzz"
75+
#line 142 "./src/util/constants.lzz"
7676
v8::Global <v8::String> source;
77-
#line 123 "./src/util/constants.lzz"
77+
#line 143 "./src/util/constants.lzz"
7878
v8::Global <v8::String> memory;
79-
#line 124 "./src/util/constants.lzz"
79+
#line 144 "./src/util/constants.lzz"
8080
v8::Global <v8::String> readonly;
81-
#line 125 "./src/util/constants.lzz"
81+
#line 145 "./src/util/constants.lzz"
8282
v8::Global <v8::String> name;
83-
#line 126 "./src/util/constants.lzz"
83+
#line 146 "./src/util/constants.lzz"
8484
v8::Global <v8::String> next;
85-
#line 127 "./src/util/constants.lzz"
85+
#line 147 "./src/util/constants.lzz"
8686
v8::Global <v8::String> length;
87-
#line 128 "./src/util/constants.lzz"
87+
#line 148 "./src/util/constants.lzz"
8888
v8::Global <v8::String> done;
89-
#line 129 "./src/util/constants.lzz"
89+
#line 149 "./src/util/constants.lzz"
9090
v8::Global <v8::String> value;
91-
#line 130 "./src/util/constants.lzz"
91+
#line 150 "./src/util/constants.lzz"
9292
v8::Global <v8::String> changes;
93-
#line 131 "./src/util/constants.lzz"
93+
#line 151 "./src/util/constants.lzz"
9494
v8::Global <v8::String> lastInsertRowid;
95-
#line 132 "./src/util/constants.lzz"
95+
#line 152 "./src/util/constants.lzz"
9696
v8::Global <v8::String> statement;
97-
#line 133 "./src/util/constants.lzz"
97+
#line 153 "./src/util/constants.lzz"
9898
v8::Global <v8::String> column;
99-
#line 134 "./src/util/constants.lzz"
99+
#line 154 "./src/util/constants.lzz"
100100
v8::Global <v8::String> table;
101-
#line 135 "./src/util/constants.lzz"
101+
#line 155 "./src/util/constants.lzz"
102102
v8::Global <v8::String> type;
103-
#line 136 "./src/util/constants.lzz"
103+
#line 156 "./src/util/constants.lzz"
104104
v8::Global <v8::String> totalPages;
105-
#line 137 "./src/util/constants.lzz"
105+
#line 157 "./src/util/constants.lzz"
106106
v8::Global <v8::String> remainingPages;
107-
#line 139 "./src/util/constants.lzz"
107+
#line 159 "./src/util/constants.lzz"
108108
private:
109-
#line 141 "./src/util/constants.lzz"
109+
#line 161 "./src/util/constants.lzz"
110110
static void SetString (v8::Isolate * isolate, v8::Global <v8::String> & constant, char const * str);
111-
#line 145 "./src/util/constants.lzz"
111+
#line 165 "./src/util/constants.lzz"
112112
void SetCode (v8::Isolate * isolate, int code, char const * str);
113-
#line 151 "./src/util/constants.lzz"
113+
#line 171 "./src/util/constants.lzz"
114114
std::unordered_map <int, v8::Global<v8::String> > codes;
115115
};
116116
#line 1 "./src/util/bind-map.lzz"

‎src/util/constants.lzz

+21-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ public:
5858
SetCode(isolate, SQLITE_WARNING, "SQLITE_WARNING");
5959
SetCode(isolate, SQLITE_ROW, "SQLITE_ROW");
6060
SetCode(isolate, SQLITE_DONE, "SQLITE_DONE");
61+
62+
SetCode(isolate, SQLITE_ERROR_MISSING_COLLSEQ, "SQLITE_ERROR_MISSING_COLLSEQ");
63+
SetCode(isolate, SQLITE_ERROR_RETRY, "SQLITE_ERROR_RETRY");
64+
SetCode(isolate, SQLITE_ERROR_SNAPSHOT, "SQLITE_ERROR_SNAPSHOT");
6165
SetCode(isolate, SQLITE_IOERR_READ, "SQLITE_IOERR_READ");
6266
SetCode(isolate, SQLITE_IOERR_SHORT_READ, "SQLITE_IOERR_SHORT_READ");
6367
SetCode(isolate, SQLITE_IOERR_WRITE, "SQLITE_IOERR_WRITE");
@@ -86,18 +90,31 @@ public:
8690
SetCode(isolate, SQLITE_IOERR_CONVPATH, "SQLITE_IOERR_CONVPATH");
8791
SetCode(isolate, SQLITE_IOERR_VNODE, "SQLITE_IOERR_VNODE");
8892
SetCode(isolate, SQLITE_IOERR_AUTH, "SQLITE_IOERR_AUTH");
93+
SetCode(isolate, SQLITE_IOERR_BEGIN_ATOMIC, "SQLITE_IOERR_BEGIN_ATOMIC");
94+
SetCode(isolate, SQLITE_IOERR_COMMIT_ATOMIC, "SQLITE_IOERR_COMMIT_ATOMIC");
95+
SetCode(isolate, SQLITE_IOERR_ROLLBACK_ATOMIC, "SQLITE_IOERR_ROLLBACK_ATOMIC");
96+
SetCode(isolate, SQLITE_IOERR_DATA, "SQLITE_IOERR_DATA");
97+
SetCode(isolate, SQLITE_IOERR_CORRUPTFS, "SQLITE_IOERR_CORRUPTFS");
98+
SetCode(isolate, SQLITE_IOERR_IN_PAGE, "SQLITE_IOERR_IN_PAGE");
8999
SetCode(isolate, SQLITE_LOCKED_SHAREDCACHE, "SQLITE_LOCKED_SHAREDCACHE");
100+
SetCode(isolate, SQLITE_LOCKED_VTAB, "SQLITE_LOCKED_VTAB");
90101
SetCode(isolate, SQLITE_BUSY_RECOVERY, "SQLITE_BUSY_RECOVERY");
91102
SetCode(isolate, SQLITE_BUSY_SNAPSHOT, "SQLITE_BUSY_SNAPSHOT");
92103
SetCode(isolate, SQLITE_CANTOPEN_NOTEMPDIR, "SQLITE_CANTOPEN_NOTEMPDIR");
93104
SetCode(isolate, SQLITE_CANTOPEN_ISDIR, "SQLITE_CANTOPEN_ISDIR");
94105
SetCode(isolate, SQLITE_CANTOPEN_FULLPATH, "SQLITE_CANTOPEN_FULLPATH");
95106
SetCode(isolate, SQLITE_CANTOPEN_CONVPATH, "SQLITE_CANTOPEN_CONVPATH");
107+
SetCode(isolate, SQLITE_CANTOPEN_DIRTYWAL, "SQLITE_CANTOPEN_DIRTYWAL");
108+
SetCode(isolate, SQLITE_CANTOPEN_SYMLINK, "SQLITE_CANTOPEN_SYMLINK");
96109
SetCode(isolate, SQLITE_CORRUPT_VTAB, "SQLITE_CORRUPT_VTAB");
110+
SetCode(isolate, SQLITE_CORRUPT_SEQUENCE, "SQLITE_CORRUPT_SEQUENCE");
111+
SetCode(isolate, SQLITE_CORRUPT_INDEX, "SQLITE_CORRUPT_INDEX");
97112
SetCode(isolate, SQLITE_READONLY_RECOVERY, "SQLITE_READONLY_RECOVERY");
98113
SetCode(isolate, SQLITE_READONLY_CANTLOCK, "SQLITE_READONLY_CANTLOCK");
99114
SetCode(isolate, SQLITE_READONLY_ROLLBACK, "SQLITE_READONLY_ROLLBACK");
100115
SetCode(isolate, SQLITE_READONLY_DBMOVED, "SQLITE_READONLY_DBMOVED");
116+
SetCode(isolate, SQLITE_READONLY_CANTINIT, "SQLITE_READONLY_CANTINIT");
117+
SetCode(isolate, SQLITE_READONLY_DIRECTORY, "SQLITE_READONLY_DIRECTORY");
101118
SetCode(isolate, SQLITE_ABORT_ROLLBACK, "SQLITE_ABORT_ROLLBACK");
102119
SetCode(isolate, SQLITE_CONSTRAINT_CHECK, "SQLITE_CONSTRAINT_CHECK");
103120
SetCode(isolate, SQLITE_CONSTRAINT_COMMITHOOK, "SQLITE_CONSTRAINT_COMMITHOOK");
@@ -109,12 +126,15 @@ public:
109126
SetCode(isolate, SQLITE_CONSTRAINT_UNIQUE, "SQLITE_CONSTRAINT_UNIQUE");
110127
SetCode(isolate, SQLITE_CONSTRAINT_VTAB, "SQLITE_CONSTRAINT_VTAB");
111128
SetCode(isolate, SQLITE_CONSTRAINT_ROWID, "SQLITE_CONSTRAINT_ROWID");
129+
SetCode(isolate, SQLITE_CONSTRAINT_PINNED, "SQLITE_CONSTRAINT_PINNED");
130+
SetCode(isolate, SQLITE_CONSTRAINT_DATATYPE, "SQLITE_CONSTRAINT_DATATYPE");
112131
SetCode(isolate, SQLITE_NOTICE_RECOVER_WAL, "SQLITE_NOTICE_RECOVER_WAL");
113132
SetCode(isolate, SQLITE_NOTICE_RECOVER_ROLLBACK, "SQLITE_NOTICE_RECOVER_ROLLBACK");
133+
SetCode(isolate, SQLITE_NOTICE_RBU, "SQLITE_NOTICE_RBU");
114134
SetCode(isolate, SQLITE_WARNING_AUTOINDEX, "SQLITE_WARNING_AUTOINDEX");
115135
SetCode(isolate, SQLITE_AUTH_USER, "SQLITE_AUTH_USER");
116136
SetCode(isolate, SQLITE_OK_LOAD_PERMANENTLY, "SQLITE_OK_LOAD_PERMANENTLY");
117-
SetCode(isolate, SQLITE_ERROR_MISSING_COLLSEQ, "SQLITE_ERROR_MISSING_COLLSEQ");
137+
SetCode(isolate, SQLITE_OK_SYMLINK, "SQLITE_OK_SYMLINK");
118138
}
119139

120140
v8::Global<v8::String> database;

0 commit comments

Comments
 (0)