dbd/postgresql/statement.c

Fri, 12 Dec 2008 03:46:34 +0000

author
nrich@ii.net
date
Fri, 12 Dec 2008 03:46:34 +0000
changeset 20
5ab0b30f8fbd
parent 17
21c4feaeafe7
child 21
7956401a0c5e
permissions
-rw-r--r--

Bugfix: the type return by 'select count(...)' was being pushed as a string because of missing psql => lua type mapping.

1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
1 #include "dbd_postgresql.h"
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
2
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
3 static lua_push_type_t postgresql_to_lua_push(unsigned int postgresql_type) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
4 lua_push_type_t lua_type;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
5
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
6 switch(postgresql_type) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
7 case INT2OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
8 case INT4OID:
20
5ab0b30f8fbd Bugfix: the type return by 'select count(...)' was being pushed as a string because of missing psql => lua type mapping.
nrich@ii.net
parents: 17
diff changeset
9 case INT8OID:
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
10 lua_type = LUA_PUSH_INTEGER;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
11 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
12
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
13 case FLOAT4OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
14 case FLOAT8OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
15 lua_type = LUA_PUSH_NUMBER;
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 BOOLOID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
19 lua_type = LUA_PUSH_BOOLEAN;
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
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
29
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
30 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
31 * success = statement:close()
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
32 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
33 static int statement_close(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
34 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
35
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
36 if (statement->result) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
37 PQclear(statement->result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
38 statement->result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
39 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
40
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
41 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
42 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
43
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
44 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
45 * success = statement:execute(...)
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
46 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
47 static int statement_execute(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
48 int n = lua_gettop(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
49 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
50 int num_bind_params = n - 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
51 ExecStatusType status;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
52 int p;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
53 const char *errstr = NULL;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
54
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 8
diff changeset
55 const char **params;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
56 PGresult *result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
57
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
58 statement->tuple = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
59
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
60 params = malloc(num_bind_params * sizeof(params));
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
61 memset(params, 0, num_bind_params * sizeof(params));
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
62
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
63 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
64 * convert and copy parameters into a string array
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
65 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
66 for (p = 2; p <= n; p++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
67 int i = p - 2;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
68 int type = lua_type(L, p);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
69 char err[64];
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
70
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
71 switch(type) {
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
72 case LUA_TNIL:
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
73 params[i] = NULL;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
74 break;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
75 case LUA_TBOOLEAN:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
76 /*
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
77 * boolean values in postgresql can either be
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
78 * t/f or 1/0. Pass integer values rather than
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
79 * strings to maintain semantic compatibility
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
80 * with other DBD drivers that pass booleans
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
81 * as integers.
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
82 */
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
83 params[i] = lua_toboolean(L, p) ? "1" : "0";
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
84 break;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
85 case LUA_TNUMBER:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
86 case LUA_TSTRING:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
87 params[i] = lua_tostring(L, p);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
88 break;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
89 default:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
90 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
91 errstr = err;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
92 goto cleanup;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
93 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
94 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
95
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
96 result = PQexecPrepared(
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
97 statement->postgresql,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
98 statement->name,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
99 num_bind_params,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
100 (const char **)params,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
101 NULL,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
102 NULL,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
103 0
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
104 );
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
105
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
106 cleanup:
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
107 free(params);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
108
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
109 if (errstr) {
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
110 lua_pushboolean(L, 0);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
111 lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, errstr);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
112 return 2;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
113 }
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
114
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
115 if (!result) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
116 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
117 lua_pushfstring(L, DBI_ERR_ALLOC_RESULT, PQerrorMessage(statement->postgresql));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
118 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
119 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
120
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
121 status = PQresultStatus(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
122 if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
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_EXEC, PQresultErrorMessage(result));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
125 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
126 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
127
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
128 statement->result = result;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
129
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
130 lua_pushboolean(L, 1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
131 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
132 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
133
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
134 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
135 * must be called after an execute
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
136 */
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
137 static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) {
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
138 int tuple = statement->tuple++;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
139 int i;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
140 int num_columns;
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
141 int d = 1;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
142
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
143 if (!statement->result) {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
144 luaL_error(L, DBI_ERR_FETCH_INVALID);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
145 return 0;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
146 }
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
147
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
148 if (PQresultStatus(statement->result) != PGRES_TUPLES_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
149 lua_pushnil(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
150 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
151 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
152
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
153 if (tuple >= PQntuples(statement->result)) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
154 lua_pushnil(L); /* no more results */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
155 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
156 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
157
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
158 num_columns = PQnfields(statement->result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
159 lua_newtable(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
160 for (i = 0; i < num_columns; i++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
161 const char *name = PQfname(statement->result, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
162
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
163 if (PQgetisnull(statement->result, tuple, i)) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
164 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
165 LUA_PUSH_ATTRIB_NIL(name);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
166 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
167 LUA_PUSH_ARRAY_NIL(d);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
168 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
169 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
170 const char *value = PQgetvalue(statement->result, tuple, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
171 lua_push_type_t lua_push = postgresql_to_lua_push(PQftype(statement->result, i));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
172
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
173 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
174 * data is returned as strings from PSQL
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 8
diff changeset
175 * convert them here into Lua types
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
176 */
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
177
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
178 if (lua_push == LUA_PUSH_NIL) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
179 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
180 LUA_PUSH_ATTRIB_NIL(name);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
181 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
182 LUA_PUSH_ARRAY_NIL(d);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
183 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
184 } else if (lua_push == LUA_PUSH_INTEGER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
185 int val = atoi(value);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
186
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
187 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
188 LUA_PUSH_ATTRIB_INT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
189 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
190 LUA_PUSH_ARRAY_INT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
191 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
192 } else if (lua_push == LUA_PUSH_NUMBER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
193 double val = strtod(value, NULL);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
194
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
195 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
196 LUA_PUSH_ATTRIB_FLOAT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
197 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
198 LUA_PUSH_ARRAY_FLOAT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
199 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
200 } else if (lua_push == LUA_PUSH_STRING) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
201 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
202 LUA_PUSH_ATTRIB_STRING(name, value);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
203 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
204 LUA_PUSH_ARRAY_STRING(d, value);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
205 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
206 } else if (lua_push == LUA_PUSH_BOOLEAN) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
207 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
208 * booleans are returned as a string
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
209 * either 't' or 'f'
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
210 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
211 int val = value[0] == 't' ? 1 : 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
212
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
213 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
214 LUA_PUSH_ATTRIB_BOOL(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
215 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
216 LUA_PUSH_ARRAY_BOOL(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
217 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
218 } else {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
219 luaL_error(L, DBI_ERR_UNKNOWN_PUSH);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
220 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
221 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
222 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
223
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
224 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
225 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
226
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
227
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
228 static int next_iterator(lua_State *L) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
229 statement_t *statement = (statement_t *)luaL_checkudata(L, lua_upvalueindex(1), DBD_POSTGRESQL_STATEMENT);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
230 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
231
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
232 return statement_fetch_impl(L, statement, named_columns);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
233 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
234
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
235 /*
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
236 * table = statement:fetch(named_indexes)
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
237 */
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
238 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
239 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_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
240 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
241
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
242 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
243 }
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
244
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
245 /*
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
246 * 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
247 */
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
248 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
249 if (lua_gettop(L) == 1) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
250 lua_pushvalue(L, 1);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
251 lua_pushboolean(L, 0);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
252 } else {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
253 lua_pushvalue(L, 1);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
254 lua_pushboolean(L, lua_toboolean(L, 2));
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
255 }
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
256
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
257 lua_pushcclosure(L, next_iterator, 2);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
258 return 1;
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
259 }
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
260
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
261 /*
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
262 * __gc
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
263 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
264 static int statement_gc(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
265 /* always free the handle */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
266 statement_close(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
267
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
268 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
269 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
270
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
271 int dbd_postgresql_statement_create(lua_State *L, connection_t *conn, const char *sql_query) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
272 statement_t *statement = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
273 ExecStatusType status;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
274 PGresult *result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
275 char *new_sql;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
276 char name[IDLEN];
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
277
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
278 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
279 * convert SQL string into a PSQL API compatible SQL statement
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
280 */
17
21c4feaeafe7 Added initial Oracle driver support - functionality is complete, but may be too buggy in its current state for any serious use.
nrich@ii.net
parents: 12
diff changeset
281 new_sql = replace_placeholders(L, '$', sql_query);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
282
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
283 snprintf(name, IDLEN, "%017u", ++conn->statement_id);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
284
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
285 result = PQprepare(conn->postgresql, name, new_sql, 0, NULL);
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
286
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
287 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
288 * free converted statement after use
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
289 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
290 free(new_sql);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
291
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
292 if (!result) {
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
293 lua_pushnil(L);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
294 lua_pushfstring(L, DBI_ERR_ALLOC_STATEMENT, PQerrorMessage(statement->postgresql));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
295 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
296 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
297
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
298 status = PQresultStatus(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
299 if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
300 const char *err_string = PQresultErrorMessage(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
301 PQclear(result);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
302
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
303 lua_pushnil(L);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
304 lua_pushfstring(L, DBI_ERR_PREP_STATEMENT, err_string);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
305 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
306 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
307
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
308 PQclear(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
309
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
310 statement = (statement_t *)lua_newuserdata(L, sizeof(statement_t));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
311 statement->postgresql = conn->postgresql;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
312 statement->result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
313 statement->tuple = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
314 strncpy(statement->name, name, IDLEN-1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
315 statement->name[IDLEN-1] = '\0';
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
316
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
317 luaL_getmetatable(L, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
318 lua_setmetatable(L, -2);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
319
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
320 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
321 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
322
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
323 int dbd_postgresql_statement(lua_State *L) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
324 static const luaL_Reg statement_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
325 {"close", statement_close},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
326 {"execute", statement_execute},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
327 {"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
328 {"rows", statement_rows},
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
329 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
330 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
331
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
332 static const luaL_Reg statement_class_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
333 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
334 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
335
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
336 luaL_newmetatable(L, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
337 luaL_register(L, 0, statement_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
338 lua_pushvalue(L,-1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
339 lua_setfield(L, -2, "__index");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
340
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
341 lua_pushcfunction(L, statement_gc);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
342 lua_setfield(L, -2, "__gc");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
343
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
344 luaL_register(L, DBD_POSTGRESQL_STATEMENT, statement_class_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
345
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
346 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
347 }

mercurial