dbd/sqlite3/statement.c

Mon, 01 Dec 2008 02:56:40 +0000

author
nrich@ii.net
date
Mon, 01 Dec 2008 02:56:40 +0000
changeset 9
06eb2850703f
parent 5
e66b88e013ca
child 10
3aa8a37a3dd8
permissions
-rw-r--r--

Bugfix: fix connection in DBD.SQLite3.New

Improve handling for booleans accross DB types

1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
1 #include "dbd_sqlite3.h"
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
2
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
3 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
4 * Converts SQLite types to Lua types
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
5 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
6 static lua_push_type_t sqlite_to_lua_push(unsigned int sqlite_type) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
7 lua_push_type_t lua_type;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
8
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
9 switch(sqlite_type) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
10 case SQLITE_NULL:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
11 lua_type = LUA_PUSH_NIL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
12 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
13
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
14 case SQLITE_INTEGER:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
15 lua_type = LUA_PUSH_INTEGER;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
16 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
17
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
18 case SQLITE_FLOAT:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
19 lua_type = LUA_PUSH_NUMBER;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
20 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
21
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
22 default:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
23 lua_type = LUA_PUSH_STRING;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
24 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
25
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
26 return lua_type;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
27 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
28
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
29 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
30 * runs sqlite3_step on a statement handle
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
31 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
32 static int step(statement_t *statement) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
33 int res = sqlite3_step(statement->stmt);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
34
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
35 if (res == SQLITE_DONE) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
36 statement->more_data = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
37 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
38 } else if (res == SQLITE_ROW) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
39 statement->more_data = 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
40 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
41 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
42
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
43 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
44 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
45
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
46 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
47 * success = statement:close()
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
48 */
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
49 int statement_close(lua_State *L) {
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
50 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
51 int ok = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
52
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
53 if (statement->stmt) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
54 if (sqlite3_finalize(statement->stmt) == SQLITE_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
55 ok = 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
56 }
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
57
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
58 statement->stmt = NULL;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
59 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
60
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
61 lua_pushboolean(L, ok);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
62 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
63 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
64
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
65 /*
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
66 * success,err = statement:execute(...)
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
67 */
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
68 int statement_execute(lua_State *L) {
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
69 int n = lua_gettop(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
70 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
71 int p;
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
72 int err = 0;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
73
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
74
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
75 if (!statement->stmt) {
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
76 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
77 lua_pushstring(L, DBI_ERR_EXECUTE_INVALID);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
78 return 2;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
79 }
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
80
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
81 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
82 * reset the handle before binding params
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
83 * this wil be a NOP if the handle has not
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
84 * been executed
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
85 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
86 if (sqlite3_reset(statement->stmt) != SQLITE_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
87 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
88 lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->sqlite));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
89 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
90 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
91
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
92 for (p = 2; p <= n; p++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
93 int i = p - 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
94
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
95 int type = lua_type(L, p);
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
96
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
97 switch(type) {
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
98 case LUA_TNIL:
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
99 err = sqlite3_bind_null(statement->stmt, i) != SQLITE_OK;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
100 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
101 case LUA_TNUMBER:
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
102 err = sqlite3_bind_double(statement->stmt, i, lua_tonumber(L, p)) != SQLITE_OK;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
103 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
104 case LUA_TSTRING:
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
105 err = sqlite3_bind_text(statement->stmt, i, lua_tostring(L, p), -1, SQLITE_STATIC) != SQLITE_OK;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
106 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
107 case LUA_TBOOLEAN:
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
108 err = sqlite3_bind_int(statement->stmt, i, lua_toboolean(L, p)) != SQLITE_OK;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
109 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
110 default:
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
111 /*
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
112 * Unknown/unsupported value type
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
113 */
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
114 err = 1;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
115 }
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
116
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
117
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
118 if (err)
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
119 break;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
120 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
121
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
122 if (err) {
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
123 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
124 lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, sqlite3_errmsg(statement->sqlite));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
125 return 2;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
126 }
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
127
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
128 if (!step(statement)) {
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
129 lua_pushboolean(L, 0);
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
130 lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->sqlite));
5
e66b88e013ca Fixed missing return.
nrich@ii.net
parents: 4
diff changeset
131 return 2;
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
132 }
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
133
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
134 lua_pushboolean(L, 1);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
135 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
136 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
137
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
138 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
139 * must be called after an execute
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
140 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
141 static int statement_fetch_impl(lua_State *L, int named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
142 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
143 int num_columns;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
144
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
145 if (!statement->stmt) {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
146 luaL_error(L, DBI_ERR_FETCH_INVALID);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
147 return 0;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
148 }
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
149
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
150 if (!statement->more_data) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
151 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
152 * Result set is empty, or not result set returned
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
153 */
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
154
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
155 lua_pushnil(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
156 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
157 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
158
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
159 num_columns = sqlite3_column_count(statement->stmt);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
160
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
161 if (num_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
162 int i;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
163 int d = 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
164
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
165 lua_newtable(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
166
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
167 for (i = 0; i < num_columns; i++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
168 lua_push_type_t lua_push = sqlite_to_lua_push(sqlite3_column_type(statement->stmt, i));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
169 const char *name = sqlite3_column_name(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
170
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
171 if (lua_push == LUA_PUSH_NIL) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
172 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
173 LUA_PUSH_ATTRIB_NIL(name);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
174 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
175 LUA_PUSH_ARRAY_NIL(d);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
176 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
177 } else if (lua_push == LUA_PUSH_INTEGER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
178 int val = sqlite3_column_int(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
179
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
180 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
181 LUA_PUSH_ATTRIB_INT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
182 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
183 LUA_PUSH_ARRAY_INT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
184 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
185 } else if (lua_push == LUA_PUSH_NUMBER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
186 double val = sqlite3_column_double(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
187
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
188 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
189 LUA_PUSH_ATTRIB_FLOAT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
190 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
191 LUA_PUSH_ARRAY_FLOAT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
192 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
193 } else if (lua_push == LUA_PUSH_STRING) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
194 const char *val = (const char *)sqlite3_column_text(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
195
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
196 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
197 LUA_PUSH_ATTRIB_STRING(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
198 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
199 LUA_PUSH_ARRAY_STRING(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
200 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
201 } else if (lua_push == LUA_PUSH_BOOLEAN) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
202 int val = sqlite3_column_int(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
203
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
204 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
205 LUA_PUSH_ATTRIB_BOOL(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
206 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
207 LUA_PUSH_ARRAY_BOOL(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
208 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
209 } else {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
210 luaL_error(L, DBI_ERR_UNKNOWN_PUSH);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
211 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
212 }
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
213 } else {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
214 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
215 * no columns returned by statement?
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
216 */
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
217 lua_pushnil(L);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
218 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
219
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
220 if (step(statement) == 0) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
221 if (sqlite3_reset(statement->stmt) != SQLITE_OK) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
222 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
223 * reset needs to be called to retrieve the 'real' error message
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
224 */
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
225 luaL_error(L, DBI_ERR_FETCH_FAILED, sqlite3_errmsg(statement->sqlite));
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
226 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
227 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
228
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
229 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
230 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
231
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
232 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
233 * array = statement:fetch()
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
234 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
235 static int statement_fetch(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
236 return statement_fetch_impl(L, 0);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
237 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
238
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
239 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
240 * hashmap = statement:fetchtable()
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
241 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
242 static int statement_fetchtable(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
243 return statement_fetch_impl(L, 1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
244 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
245
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
246 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
247 * __gc
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
248 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
249 static int statement_gc(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
250 /* always free the handle */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
251 statement_close(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
252
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
253 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
254 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
255
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
256 int dbd_sqlite3_statement_create(lua_State *L, connection_t *conn, const char *sql_query) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
257 statement_t *statement = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
258
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
259 statement = (statement_t *)lua_newuserdata(L, sizeof(statement_t));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
260 statement->sqlite = conn->sqlite;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
261 statement->stmt = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
262 statement->more_data = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
263
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
264 if (sqlite3_prepare_v2(statement->sqlite, sql_query, strlen(sql_query), &statement->stmt, NULL) != SQLITE_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
265 lua_pushnil(L);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
266 lua_pushfstring(L, DBI_ERR_PREP_STATEMENT, sqlite3_errmsg(statement->sqlite));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
267 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
268 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
269
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
270 luaL_getmetatable(L, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
271 lua_setmetatable(L, -2);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
272 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
273 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
274
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
275 int dbd_sqlite3_statement(lua_State *L) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
276 static const luaL_Reg statement_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
277 {"close", statement_close},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
278 {"execute", statement_execute},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
279 {"fetch", statement_fetch},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
280 {"fetchtable", statement_fetchtable},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
281 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
282 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
283
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
284 static const luaL_Reg statement_class_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
285 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
286 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
287
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
288 luaL_newmetatable(L, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
289 luaL_register(L, 0, statement_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
290 lua_pushvalue(L,-1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
291 lua_setfield(L, -2, "__index");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
292
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
293 lua_pushcfunction(L, statement_gc);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
294 lua_setfield(L, -2, "__gc");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
295
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
296 luaL_register(L, DBD_SQLITE_STATEMENT, statement_class_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
297
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
298 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
299 }

mercurial