Mon, 20 Dec 2010 09:01:12 +0000
Fix DBD.SQLite3 transaction handling
1 | 1 | #include "dbd_sqlite3.h" |
2 | ||
41 | 3 | extern int try_begin_transaction(connection_t *conn); |
4 | extern int try_end_transaction(connection_t *conn); | |
5 | ||
2 | 6 | /* |
7 | * Converts SQLite types to Lua types | |
8 | */ | |
1 | 9 | static lua_push_type_t sqlite_to_lua_push(unsigned int sqlite_type) { |
10 | lua_push_type_t lua_type; | |
11 | ||
12 | switch(sqlite_type) { | |
13 | case SQLITE_NULL: | |
14 | lua_type = LUA_PUSH_NIL; | |
15 | break; | |
16 | ||
17 | case SQLITE_INTEGER: | |
18 | lua_type = LUA_PUSH_INTEGER; | |
19 | break; | |
20 | ||
21 | case SQLITE_FLOAT: | |
22 | lua_type = LUA_PUSH_NUMBER; | |
23 | break; | |
24 | ||
25 | default: | |
26 | lua_type = LUA_PUSH_STRING; | |
27 | } | |
28 | ||
29 | return lua_type; | |
30 | } | |
31 | ||
2 | 32 | /* |
33 | * runs sqlite3_step on a statement handle | |
34 | */ | |
1 | 35 | static int step(statement_t *statement) { |
36 | int res = sqlite3_step(statement->stmt); | |
37 | ||
38 | if (res == SQLITE_DONE) { | |
39 | statement->more_data = 0; | |
40 | return 1; | |
41 | } else if (res == SQLITE_ROW) { | |
42 | statement->more_data = 1; | |
43 | return 1; | |
44 | } | |
45 | ||
46 | return 0; | |
47 | } | |
48 | ||
2 | 49 | /* |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
50 | * num_affected_rows = statement:affected() |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
51 | */ |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
52 | static int statement_affected(lua_State *L) { |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
53 | statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT); |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
54 | |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
55 | if (!statement->stmt) { |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
56 | luaL_error(L, DBI_ERR_INVALID_STATEMENT); |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
57 | } |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
58 | |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
59 | lua_pushinteger(L, statement->affected); |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
60 | |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
61 | return 1; |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
62 | } |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
63 | |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
64 | /* |
2 | 65 | * success = statement:close() |
66 | */ | |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
67 | static int statement_close(lua_State *L) { |
1 | 68 | statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT); |
69 | int ok = 0; | |
70 | ||
71 | if (statement->stmt) { | |
72 | if (sqlite3_finalize(statement->stmt) == SQLITE_OK) { | |
73 | ok = 1; | |
74 | } | |
3 | 75 | |
76 | statement->stmt = NULL; | |
1 | 77 | } |
78 | ||
79 | lua_pushboolean(L, ok); | |
80 | return 1; | |
81 | } | |
82 | ||
2 | 83 | /* |
30
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
84 | * column_names = statement:columns() |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
85 | */ |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
86 | static int statement_columns(lua_State *L) { |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
87 | statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT); |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
88 | |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
89 | int i; |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
90 | int num_columns; |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
91 | int d = 1; |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
92 | |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
93 | if (!statement->stmt) { |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
94 | luaL_error(L, DBI_ERR_INVALID_STATEMENT); |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
95 | return 0; |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
96 | } |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
97 | |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
98 | num_columns = sqlite3_column_count(statement->stmt); |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
99 | lua_newtable(L); |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
100 | for (i = 0; i < num_columns; i++) { |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
101 | const char *name = sqlite3_column_name(statement->stmt, i); |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
102 | |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
103 | LUA_PUSH_ARRAY_STRING(d, name); |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
104 | } |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
105 | |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
106 | return 1; |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
107 | } |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
108 | |
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
109 | /* |
3 | 110 | * success,err = statement:execute(...) |
2 | 111 | */ |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
112 | static int statement_execute(lua_State *L) { |
1 | 113 | int n = lua_gettop(L); |
114 | statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT); | |
115 | int p; | |
10 | 116 | int errflag = 0; |
117 | const char *errstr = NULL; | |
118 | int expected_params; | |
119 | int num_bind_params = n - 1; | |
3 | 120 | |
121 | if (!statement->stmt) { | |
122 | lua_pushboolean(L, 0); | |
4 | 123 | lua_pushstring(L, DBI_ERR_EXECUTE_INVALID); |
3 | 124 | return 2; |
125 | } | |
1 | 126 | |
2 | 127 | /* |
128 | * reset the handle before binding params | |
33 | 129 | * this will be a NOP if the handle has not |
2 | 130 | * been executed |
131 | */ | |
1 | 132 | if (sqlite3_reset(statement->stmt) != SQLITE_OK) { |
133 | lua_pushboolean(L, 0); | |
41 | 134 | lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->conn->sqlite)); |
3 | 135 | return 2; |
1 | 136 | } |
137 | ||
41 | 138 | sqlite3_clear_bindings(statement->stmt); |
139 | ||
10 | 140 | expected_params = sqlite3_bind_parameter_count(statement->stmt); |
141 | if (expected_params != num_bind_params) { | |
142 | /* | |
143 | * sqlite3_reset does not handle this condition, | |
144 | * and the client library will fill unset params | |
145 | * with NULLs | |
146 | */ | |
147 | lua_pushboolean(L, 0); | |
148 | lua_pushfstring(L, DBI_ERR_PARAM_MISCOUNT, expected_params, num_bind_params); | |
149 | return 2; | |
150 | } | |
151 | ||
1 | 152 | for (p = 2; p <= n; p++) { |
153 | int i = p - 1; | |
9 | 154 | int type = lua_type(L, p); |
10 | 155 | char err[64]; |
9 | 156 | |
157 | switch(type) { | |
158 | case LUA_TNIL: | |
10 | 159 | errflag = sqlite3_bind_null(statement->stmt, i) != SQLITE_OK; |
9 | 160 | break; |
161 | case LUA_TNUMBER: | |
10 | 162 | errflag = sqlite3_bind_double(statement->stmt, i, lua_tonumber(L, p)) != SQLITE_OK; |
9 | 163 | break; |
164 | case LUA_TSTRING: | |
10 | 165 | errflag = sqlite3_bind_text(statement->stmt, i, lua_tostring(L, p), -1, SQLITE_STATIC) != SQLITE_OK; |
9 | 166 | break; |
167 | case LUA_TBOOLEAN: | |
10 | 168 | errflag = sqlite3_bind_int(statement->stmt, i, lua_toboolean(L, p)) != SQLITE_OK; |
9 | 169 | break; |
170 | default: | |
171 | /* | |
172 | * Unknown/unsupported value type | |
173 | */ | |
10 | 174 | errflag = 1; |
175 | snprintf(err, sizeof(err)-1, DBI_ERR_BINDING_TYPE_ERR, lua_typename(L, type)); | |
176 | errstr = err; | |
1 | 177 | } |
3 | 178 | |
10 | 179 | if (errflag) |
3 | 180 | break; |
1 | 181 | } |
182 | ||
10 | 183 | if (errflag) { |
3 | 184 | lua_pushboolean(L, 0); |
10 | 185 | if (errstr) |
186 | lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, errstr); | |
187 | else | |
41 | 188 | lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, sqlite3_errmsg(statement->conn->sqlite)); |
189 | ||
190 | return 2; | |
191 | } | |
10 | 192 | |
41 | 193 | try_begin_transaction(statement->conn); |
194 | ||
195 | if (!step(statement)) { | |
196 | lua_pushboolean(L, 0); | |
197 | lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->conn->sqlite)); | |
3 | 198 | return 2; |
199 | } | |
200 | ||
41 | 201 | statement->affected = sqlite3_changes(statement->conn->sqlite); |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
202 | |
3 | 203 | lua_pushboolean(L, 1); |
1 | 204 | return 1; |
205 | } | |
206 | ||
2 | 207 | /* |
208 | * must be called after an execute | |
209 | */ | |
11
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
210 | static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) { |
1 | 211 | int num_columns; |
212 | ||
3 | 213 | if (!statement->stmt) { |
4 | 214 | luaL_error(L, DBI_ERR_FETCH_INVALID); |
3 | 215 | return 0; |
216 | } | |
217 | ||
1 | 218 | if (!statement->more_data) { |
2 | 219 | /* |
220 | * Result set is empty, or not result set returned | |
221 | */ | |
222 | ||
1 | 223 | lua_pushnil(L); |
224 | return 1; | |
225 | } | |
226 | ||
227 | num_columns = sqlite3_column_count(statement->stmt); | |
228 | ||
229 | if (num_columns) { | |
230 | int i; | |
231 | int d = 1; | |
232 | ||
233 | lua_newtable(L); | |
234 | ||
235 | for (i = 0; i < num_columns; i++) { | |
236 | lua_push_type_t lua_push = sqlite_to_lua_push(sqlite3_column_type(statement->stmt, i)); | |
237 | const char *name = sqlite3_column_name(statement->stmt, i); | |
238 | ||
239 | if (lua_push == LUA_PUSH_NIL) { | |
240 | if (named_columns) { | |
241 | LUA_PUSH_ATTRIB_NIL(name); | |
242 | } else { | |
243 | LUA_PUSH_ARRAY_NIL(d); | |
244 | } | |
245 | } else if (lua_push == LUA_PUSH_INTEGER) { | |
246 | int val = sqlite3_column_int(statement->stmt, i); | |
247 | ||
248 | if (named_columns) { | |
249 | LUA_PUSH_ATTRIB_INT(name, val); | |
250 | } else { | |
251 | LUA_PUSH_ARRAY_INT(d, val); | |
252 | } | |
253 | } else if (lua_push == LUA_PUSH_NUMBER) { | |
254 | double val = sqlite3_column_double(statement->stmt, i); | |
255 | ||
256 | if (named_columns) { | |
257 | LUA_PUSH_ATTRIB_FLOAT(name, val); | |
258 | } else { | |
259 | LUA_PUSH_ARRAY_FLOAT(d, val); | |
260 | } | |
261 | } else if (lua_push == LUA_PUSH_STRING) { | |
262 | const char *val = (const char *)sqlite3_column_text(statement->stmt, i); | |
263 | ||
264 | if (named_columns) { | |
265 | LUA_PUSH_ATTRIB_STRING(name, val); | |
266 | } else { | |
267 | LUA_PUSH_ARRAY_STRING(d, val); | |
268 | } | |
269 | } else if (lua_push == LUA_PUSH_BOOLEAN) { | |
270 | int val = sqlite3_column_int(statement->stmt, i); | |
271 | ||
272 | if (named_columns) { | |
273 | LUA_PUSH_ATTRIB_BOOL(name, val); | |
274 | } else { | |
275 | LUA_PUSH_ARRAY_BOOL(d, val); | |
276 | } | |
277 | } else { | |
4 | 278 | luaL_error(L, DBI_ERR_UNKNOWN_PUSH); |
1 | 279 | } |
280 | } | |
2 | 281 | } else { |
282 | /* | |
283 | * no columns returned by statement? | |
284 | */ | |
285 | lua_pushnil(L); | |
1 | 286 | } |
287 | ||
288 | if (step(statement) == 0) { | |
289 | if (sqlite3_reset(statement->stmt) != SQLITE_OK) { | |
2 | 290 | /* |
291 | * reset needs to be called to retrieve the 'real' error message | |
292 | */ | |
41 | 293 | luaL_error(L, DBI_ERR_FETCH_FAILED, sqlite3_errmsg(statement->conn->sqlite)); |
1 | 294 | } |
295 | } | |
296 | ||
297 | return 1; | |
298 | } | |
299 | ||
11
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
300 | static int next_iterator(lua_State *L) { |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
301 | statement_t *statement = (statement_t *)luaL_checkudata(L, lua_upvalueindex(1), DBD_SQLITE_STATEMENT); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
302 | int named_columns = lua_toboolean(L, lua_upvalueindex(2)); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
303 | |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
304 | return statement_fetch_impl(L, statement, named_columns); |
1 | 305 | } |
306 | ||
2 | 307 | /* |
12
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
308 | * table = statement:fetch(named_indexes) |
2 | 309 | */ |
12
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
310 | static int statement_fetch(lua_State *L) { |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
311 | statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT); |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
312 | int named_columns = lua_toboolean(L, 2); |
11
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
313 | |
12
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
314 | return statement_fetch_impl(L, statement, named_columns); |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
315 | } |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
316 | |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
317 | /* |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
318 | * iterfunc = statement:rows(named_indexes) |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
319 | */ |
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
320 | static int statement_rows(lua_State *L) { |
11
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
321 | if (lua_gettop(L) == 1) { |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
322 | lua_pushvalue(L, 1); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
323 | lua_pushboolean(L, 0); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
324 | } else { |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
325 | lua_pushvalue(L, 1); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
326 | lua_pushboolean(L, lua_toboolean(L, 2)); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
327 | } |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
328 | |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
329 | lua_pushcclosure(L, next_iterator, 2); |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
330 | return 1; |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
331 | } |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
332 | |
b3e05e361f46
Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents:
10
diff
changeset
|
333 | /* |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
334 | * num_rows = statement:rowcount() |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
335 | */ |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
336 | static int statement_rowcount(lua_State *L) { |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
337 | luaL_error(L, DBI_ERR_NOT_IMPLEMENTED, DBD_SQLITE_STATEMENT, "rowcount"); |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
338 | |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
339 | return 0; |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
340 | } |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
341 | |
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
342 | /* |
2 | 343 | * __gc |
344 | */ | |
1 | 345 | static int statement_gc(lua_State *L) { |
346 | /* always free the handle */ | |
347 | statement_close(L); | |
348 | ||
349 | return 0; | |
350 | } | |
351 | ||
32
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
352 | /* |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
353 | * __tostring |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
354 | */ |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
355 | static int statement_tostring(lua_State *L) { |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
356 | statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT); |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
357 | |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
358 | lua_pushfstring(L, "%s: %p", DBD_SQLITE_STATEMENT, statement); |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
359 | |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
360 | return 1; |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
361 | } |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
362 | |
1 | 363 | int dbd_sqlite3_statement_create(lua_State *L, connection_t *conn, const char *sql_query) { |
364 | statement_t *statement = NULL; | |
365 | ||
366 | statement = (statement_t *)lua_newuserdata(L, sizeof(statement_t)); | |
41 | 367 | statement->conn = conn; |
1 | 368 | statement->stmt = NULL; |
369 | statement->more_data = 0; | |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
370 | statement->affected = 0; |
1 | 371 | |
41 | 372 | if (sqlite3_prepare_v2(statement->conn->sqlite, sql_query, strlen(sql_query), &statement->stmt, NULL) != SQLITE_OK) { |
1 | 373 | lua_pushnil(L); |
41 | 374 | lua_pushfstring(L, DBI_ERR_PREP_STATEMENT, sqlite3_errmsg(statement->conn->sqlite)); |
3 | 375 | return 2; |
1 | 376 | } |
377 | ||
378 | luaL_getmetatable(L, DBD_SQLITE_STATEMENT); | |
379 | lua_setmetatable(L, -2); | |
380 | return 1; | |
381 | } | |
382 | ||
383 | int dbd_sqlite3_statement(lua_State *L) { | |
2 | 384 | static const luaL_Reg statement_methods[] = { |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
385 | {"affected", statement_affected}, |
2 | 386 | {"close", statement_close}, |
30
8599f34c139b
Add 'columns' method to statement handles to retrieve column names from a result set
nrich@ii.net
parents:
21
diff
changeset
|
387 | {"columns", statement_columns}, |
2 | 388 | {"execute", statement_execute}, |
389 | {"fetch", statement_fetch}, | |
12
014ba3ab3903
Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.
nrich@ii.net
parents:
11
diff
changeset
|
390 | {"rows", statement_rows}, |
21
7956401a0c5e
Added the statement:affected() and statement:rowcount() methods.
nrich@ii.net
parents:
12
diff
changeset
|
391 | {"rowcount", statement_rowcount}, |
2 | 392 | {NULL, NULL} |
393 | }; | |
394 | ||
395 | static const luaL_Reg statement_class_methods[] = { | |
396 | {NULL, NULL} | |
397 | }; | |
398 | ||
1 | 399 | luaL_newmetatable(L, DBD_SQLITE_STATEMENT); |
400 | luaL_register(L, 0, statement_methods); | |
401 | lua_pushvalue(L,-1); | |
402 | lua_setfield(L, -2, "__index"); | |
403 | ||
404 | lua_pushcfunction(L, statement_gc); | |
405 | lua_setfield(L, -2, "__gc"); | |
406 | ||
32
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
407 | lua_pushcfunction(L, statement_tostring); |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
408 | lua_setfield(L, -2, "__tostring"); |
03ed0ca09837
Add __tostring method to connection and statement objects.
nrich@ii.net
parents:
30
diff
changeset
|
409 | |
1 | 410 | luaL_register(L, DBD_SQLITE_STATEMENT, statement_class_methods); |
411 | ||
412 | return 1; | |
413 | } |