dbd/sqlite3/statement.c

Tue, 02 Dec 2008 21:11:27 +0000

author
nrich@ii.net
date
Tue, 02 Dec 2008 21:11:27 +0000
changeset 12
014ba3ab3903
parent 11
b3e05e361f46
child 21
7956401a0c5e
permissions
-rw-r--r--

Renamed statement:fetch() to statement:rows(), and statement:row() to statement:fetch(). The API reads better this way.

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;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
72 int errflag = 0;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
73 const char *errstr = NULL;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
74 int expected_params;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
75 int num_bind_params = n - 1;
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
76
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
77 if (!statement->stmt) {
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
78 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
79 lua_pushstring(L, DBI_ERR_EXECUTE_INVALID);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
80 return 2;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
81 }
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
82
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
83 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
84 * reset the handle before binding params
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
85 * this wil be a NOP if the handle has not
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
86 * been executed
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
87 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
88 if (sqlite3_reset(statement->stmt) != SQLITE_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
89 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
90 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
91 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
92 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
93
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
94 expected_params = sqlite3_bind_parameter_count(statement->stmt);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
95 if (expected_params != num_bind_params) {
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
96 /*
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
97 * sqlite3_reset does not handle this condition,
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
98 * and the client library will fill unset params
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
99 * with NULLs
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
100 */
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
101 lua_pushboolean(L, 0);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
102 lua_pushfstring(L, DBI_ERR_PARAM_MISCOUNT, expected_params, num_bind_params);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
103 return 2;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
104 }
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
105
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
106 for (p = 2; p <= n; p++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
107 int i = p - 1;
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
108 int type = lua_type(L, p);
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
109 char err[64];
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
110
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
111 switch(type) {
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
112 case LUA_TNIL:
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
113 errflag = sqlite3_bind_null(statement->stmt, i) != SQLITE_OK;
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
114 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
115 case LUA_TNUMBER:
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
116 errflag = sqlite3_bind_double(statement->stmt, i, lua_tonumber(L, p)) != SQLITE_OK;
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
117 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
118 case LUA_TSTRING:
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
119 errflag = sqlite3_bind_text(statement->stmt, i, lua_tostring(L, p), -1, SQLITE_STATIC) != SQLITE_OK;
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
120 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
121 case LUA_TBOOLEAN:
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
122 errflag = sqlite3_bind_int(statement->stmt, i, lua_toboolean(L, p)) != SQLITE_OK;
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
123 break;
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
124 default:
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
125 /*
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
126 * Unknown/unsupported value type
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 5
diff changeset
127 */
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
128 errflag = 1;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
129 snprintf(err, sizeof(err)-1, DBI_ERR_BINDING_TYPE_ERR, lua_typename(L, type));
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
130 errstr = err;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
131 }
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
132
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
133 if (errflag)
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
134 break;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
135 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
136
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
137 if (errflag) {
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
138 lua_pushboolean(L, 0);
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
139 if (errstr)
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
140 lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, errstr);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
141 else
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
142 lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, sqlite3_errmsg(statement->sqlite));
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
143
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
144 return 2;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
145 }
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
146
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
147 if (!step(statement)) {
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
148 lua_pushboolean(L, 0);
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
149 lua_pushfstring(L, DBI_ERR_EXECUTE_FAILED, sqlite3_errmsg(statement->sqlite));
5
e66b88e013ca Fixed missing return.
nrich@ii.net
parents: 4
diff changeset
150 return 2;
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
151 }
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
152
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
153 lua_pushboolean(L, 1);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
154 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
155 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
156
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
157 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
158 * must be called after an execute
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
159 */
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
160 static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) {
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
161 int num_columns;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
162
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
163 if (!statement->stmt) {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
164 luaL_error(L, DBI_ERR_FETCH_INVALID);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
165 return 0;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
166 }
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
167
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
168 if (!statement->more_data) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
169 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
170 * Result set is empty, or not result set returned
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
171 */
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
172
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
173 lua_pushnil(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
174 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
175 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
176
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
177 num_columns = sqlite3_column_count(statement->stmt);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
178
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
179 if (num_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
180 int i;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
181 int d = 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
182
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
183 lua_newtable(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
184
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
185 for (i = 0; i < num_columns; i++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
186 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
187 const char *name = sqlite3_column_name(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
188
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
189 if (lua_push == LUA_PUSH_NIL) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
190 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
191 LUA_PUSH_ATTRIB_NIL(name);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
192 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
193 LUA_PUSH_ARRAY_NIL(d);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
194 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
195 } else if (lua_push == LUA_PUSH_INTEGER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
196 int val = sqlite3_column_int(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
197
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
198 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
199 LUA_PUSH_ATTRIB_INT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
200 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
201 LUA_PUSH_ARRAY_INT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
202 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
203 } else if (lua_push == LUA_PUSH_NUMBER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
204 double val = sqlite3_column_double(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
205
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
206 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
207 LUA_PUSH_ATTRIB_FLOAT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
208 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
209 LUA_PUSH_ARRAY_FLOAT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
210 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
211 } else if (lua_push == LUA_PUSH_STRING) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
212 const char *val = (const char *)sqlite3_column_text(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
213
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
214 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
215 LUA_PUSH_ATTRIB_STRING(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
216 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
217 LUA_PUSH_ARRAY_STRING(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
218 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
219 } else if (lua_push == LUA_PUSH_BOOLEAN) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
220 int val = sqlite3_column_int(statement->stmt, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
221
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
222 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
223 LUA_PUSH_ATTRIB_BOOL(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
224 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
225 LUA_PUSH_ARRAY_BOOL(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
226 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
227 } else {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
228 luaL_error(L, DBI_ERR_UNKNOWN_PUSH);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
229 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
230 }
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
231 } else {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
232 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
233 * no columns returned by statement?
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
234 */
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
235 lua_pushnil(L);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
236 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
237
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
238 if (step(statement) == 0) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
239 if (sqlite3_reset(statement->stmt) != SQLITE_OK) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
240 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
241 * reset needs to be called to retrieve the 'real' error message
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
242 */
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
243 luaL_error(L, DBI_ERR_FETCH_FAILED, sqlite3_errmsg(statement->sqlite));
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
244 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
245 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
246
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
247 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
248 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
249
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
250 static int next_iterator(lua_State *L) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
251 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
252 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
253
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
254 return statement_fetch_impl(L, statement, named_columns);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
255 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
256
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
257 /*
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
258 * table = statement:fetch(named_indexes)
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
259 */
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
260 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
261 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
262 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
263
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
264 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
265 }
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
266
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
267 /*
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
268 * 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
269 */
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
270 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
271 if (lua_gettop(L) == 1) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
272 lua_pushvalue(L, 1);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
273 lua_pushboolean(L, 0);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
274 } else {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
275 lua_pushvalue(L, 1);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
276 lua_pushboolean(L, lua_toboolean(L, 2));
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
277 }
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
278
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
279 lua_pushcclosure(L, next_iterator, 2);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
280 return 1;
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
281 }
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
282
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
283 /*
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
284 * __gc
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
285 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
286 static int statement_gc(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
287 /* always free the handle */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
288 statement_close(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
289
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
290 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
291 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
292
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
293 int dbd_sqlite3_statement_create(lua_State *L, connection_t *conn, const char *sql_query) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
294 statement_t *statement = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
295
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
296 statement = (statement_t *)lua_newuserdata(L, sizeof(statement_t));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
297 statement->sqlite = conn->sqlite;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
298 statement->stmt = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
299 statement->more_data = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
300
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
301 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
302 lua_pushnil(L);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
303 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
304 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
305 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
306
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
307 luaL_getmetatable(L, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
308 lua_setmetatable(L, -2);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
309 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
310 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
311
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
312 int dbd_sqlite3_statement(lua_State *L) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
313 static const luaL_Reg statement_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
314 {"close", statement_close},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
315 {"execute", statement_execute},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
316 {"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
317 {"rows", statement_rows},
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
318 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
319 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
320
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
321 static const luaL_Reg statement_class_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
322 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
323 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
324
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
325 luaL_newmetatable(L, DBD_SQLITE_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
326 luaL_register(L, 0, statement_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
327 lua_pushvalue(L,-1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
328 lua_setfield(L, -2, "__index");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
329
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
330 lua_pushcfunction(L, statement_gc);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
331 lua_setfield(L, -2, "__gc");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
332
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
333 luaL_register(L, DBD_SQLITE_STATEMENT, statement_class_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
334
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
335 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
336 }

mercurial