dbd/postgresql/statement.c

Tue, 02 Dec 2008 08:10:54 +0000

author
nrich@ii.net
date
Tue, 02 Dec 2008 08:10:54 +0000
changeset 11
b3e05e361f46
parent 10
3aa8a37a3dd8
child 12
014ba3ab3903
permissions
-rw-r--r--

Bugfix: PSQL array returns were not being indexed properly.

Changes:
* statement:fetch() returns an iterator
* statement:row() added to replace old statement:fetch() behaviour
* statement:fetch() and statement:row() now take an optional boolean value to either return an array(false, default) or a hashmap (true)

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
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
3 #define MAX_PLACEHOLDERS 9999
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
4 #define MAX_PLACEHOLDER_SIZE (1+4) /* $\d{4} */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
5
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
6 static lua_push_type_t postgresql_to_lua_push(unsigned int postgresql_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(postgresql_type) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
10 case INT2OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
11 case INT4OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
12 lua_type = LUA_PUSH_INTEGER;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
13 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
14
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
15 case FLOAT4OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
16 case FLOAT8OID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
17 lua_type = LUA_PUSH_NUMBER;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
18 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
19
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
20 case BOOLOID:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
21 lua_type = LUA_PUSH_BOOLEAN;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
22 break;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
23
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
24 default:
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
25 lua_type = LUA_PUSH_STRING;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
26 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
27
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
28 return lua_type;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
29 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
30
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
31 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
32 * replace '?' placeholders with $\d+ placeholders
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
33 * to be compatible with PSQL API
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
34 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
35 static char *replace_placeholders(lua_State *L, const char *sql) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
36 size_t len = strlen(sql);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
37 int num_placeholders = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
38 int extra_space = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
39 int i;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
40 char *newsql;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
41 int newpos = 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
42 int ph_num = 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
43 int in_quote = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
44
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
45 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
46 * dumb count of all '?'
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
47 * this will match more placeholders than necessesary
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
48 * but it's safer to allocate more placeholders at the
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
49 * cost of a few bytes than risk a buffer overflow
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
50 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
51 for (i = 1; i < len; i++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
52 if (sql[i] == '?') {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
53 num_placeholders++;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
54 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
55 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
56
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
57 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
58 * this is MAX_PLACEHOLDER_SIZE-1 because the '?' is
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
59 * replaced with '$'
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
60 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
61 extra_space = num_placeholders * (MAX_PLACEHOLDER_SIZE-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 * allocate a new string for the converted SQL statement
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
65 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
66 newsql = malloc(sizeof(char) * (len+extra_space+1));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
67 memset(newsql, 0, sizeof(char) * (len+extra_space+1));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
68
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
69 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
70 * copy first char. In valid SQL this cannot be a placeholder
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
71 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
72 newsql[0] = sql[0];
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
73
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
74 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
75 * only replace '?' not in a single quoted string
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
76 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
77 for (i = 1; i < len; i++) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
78 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
79 * don't change the quote flag if the ''' is preceded
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
80 * bt a '\' to account for escaping
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
81 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
82 if (sql[i] == '\'' && sql[i-1] != '\\') {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
83 in_quote = !in_quote;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
84 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
85
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
86 if (sql[i] == '?' && !in_quote) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
87 size_t n;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
88
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
89 if (ph_num > MAX_PLACEHOLDERS) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
90 luaL_error(L, "Sorry, you are using more than %d placeholders. Use ${num} format instead", MAX_PLACEHOLDERS);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
91 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
92
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
93 n = snprintf(&newsql[newpos], MAX_PLACEHOLDER_SIZE, "$%u", ph_num++);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
94
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
95 newpos += n;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
96 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
97 newsql[newpos] = sql[i];
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
98 newpos++;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
99 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
100 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
101
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
102 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
103 * terminate string on the last position
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
104 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
105 newsql[newpos] = '\0';
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
106
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
107 /* fprintf(stderr, "[%s]\n", newsql); */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
108 return newsql;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
109 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
110
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
111 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
112 * success = statement:close()
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
113 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
114 static int statement_close(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
115 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
116
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
117 if (statement->result) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
118 PQclear(statement->result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
119 statement->result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
120 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
121
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
122 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
123 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
124
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
125 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
126 * success = statement:execute(...)
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
127 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
128 static int statement_execute(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
129 int n = lua_gettop(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
130 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
131 int num_bind_params = n - 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
132 ExecStatusType status;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
133 int p;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
134 const char *errstr = NULL;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
135
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 8
diff changeset
136 const char **params;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
137 PGresult *result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
138
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
139 statement->tuple = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
140
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
141 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
142 memset(params, 0, num_bind_params * sizeof(params));
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
143
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
144 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
145 * convert and copy parameters into a string array
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
146 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
147 for (p = 2; p <= n; p++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
148 int i = p - 2;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
149 int type = lua_type(L, p);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
150 char err[64];
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
151
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
152 switch(type) {
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
153 case LUA_TNIL:
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
154 params[i] = NULL;
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
155 break;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
156 case LUA_TBOOLEAN:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
157 /*
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
158 * boolean values in postgresql can either be
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
159 * t/f or 1/0. Pass integer values rather than
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
160 * strings to maintain semantic compatibility
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
161 * with other DBD drivers that pass booleans
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
162 * as integers.
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
163 */
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
164 params[i] = lua_toboolean(L, p) ? "1" : "0";
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
165 break;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
166 case LUA_TNUMBER:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
167 case LUA_TSTRING:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
168 params[i] = lua_tostring(L, p);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
169 break;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
170 default:
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
171 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
172 errstr = err;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
173 goto cleanup;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
174 }
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 result = PQexecPrepared(
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
178 statement->postgresql,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
179 statement->name,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
180 num_bind_params,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
181 (const char **)params,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
182 NULL,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
183 NULL,
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
184 0
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
185 );
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
186
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
187 cleanup:
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
188 free(params);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
189
10
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
190 if (errstr) {
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
191 lua_pushboolean(L, 0);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
192 lua_pushfstring(L, DBI_ERR_BINDING_PARAMS, errstr);
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
193 return 2;
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
194 }
3aa8a37a3dd8 Added new typechecks and errors
nrich@ii.net
parents: 9
diff changeset
195
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
196 if (!result) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
197 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
198 lua_pushfstring(L, DBI_ERR_ALLOC_RESULT, PQerrorMessage(statement->postgresql));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
199 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
200 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
201
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
202 status = PQresultStatus(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
203 if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
204 lua_pushboolean(L, 0);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
205 lua_pushfstring(L, DBI_ERR_BINDING_EXEC, PQresultErrorMessage(result));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
206 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
207 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
208
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
209 statement->result = result;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
210
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
211 lua_pushboolean(L, 1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
212 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
213 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
214
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
215 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
216 * must be called after an execute
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
217 */
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
218 static int statement_fetch_impl(lua_State *L, statement_t *statement, int named_columns) {
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
219 int tuple = statement->tuple++;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
220 int i;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
221 int num_columns;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
222
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
223 if (!statement->result) {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
224 luaL_error(L, DBI_ERR_FETCH_INVALID);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
225 return 0;
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
226 }
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
227
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
228 if (PQresultStatus(statement->result) != PGRES_TUPLES_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
229 lua_pushnil(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
230 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
231 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
232
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
233 if (tuple >= PQntuples(statement->result)) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
234 lua_pushnil(L); /* no more results */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
235 return 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 num_columns = PQnfields(statement->result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
239 lua_newtable(L);
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
240 int d = 1;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
241 for (i = 0; i < num_columns; i++) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
242 const char *name = PQfname(statement->result, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
243
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
244 if (PQgetisnull(statement->result, tuple, i)) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
245 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
246 LUA_PUSH_ATTRIB_NIL(name);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
247 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
248 LUA_PUSH_ARRAY_NIL(d);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
249 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
250 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
251 const char *value = PQgetvalue(statement->result, tuple, i);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
252 lua_push_type_t lua_push = postgresql_to_lua_push(PQftype(statement->result, i));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
253
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
254 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
255 * data is returned as strings from PSQL
9
06eb2850703f Bugfix: fix connection in DBD.SQLite3.New
nrich@ii.net
parents: 8
diff changeset
256 * convert them here into Lua types
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
257 */
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
258
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
259 if (lua_push == LUA_PUSH_NIL) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
260 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
261 LUA_PUSH_ATTRIB_NIL(name);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
262 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
263 LUA_PUSH_ARRAY_NIL(d);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
264 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
265 } else if (lua_push == LUA_PUSH_INTEGER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
266 int val = atoi(value);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
267
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
268 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
269 LUA_PUSH_ATTRIB_INT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
270 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
271 LUA_PUSH_ARRAY_INT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
272 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
273 } else if (lua_push == LUA_PUSH_NUMBER) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
274 double val = strtod(value, NULL);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
275
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
276 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
277 LUA_PUSH_ATTRIB_FLOAT(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
278 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
279 LUA_PUSH_ARRAY_FLOAT(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
280 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
281 } else if (lua_push == LUA_PUSH_STRING) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
282 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
283 LUA_PUSH_ATTRIB_STRING(name, value);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
284 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
285 LUA_PUSH_ARRAY_STRING(d, value);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
286 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
287 } else if (lua_push == LUA_PUSH_BOOLEAN) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
288 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
289 * booleans are returned as a string
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
290 * either 't' or 'f'
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
291 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
292 int val = value[0] == 't' ? 1 : 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
293
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
294 if (named_columns) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
295 LUA_PUSH_ATTRIB_BOOL(name, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
296 } else {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
297 LUA_PUSH_ARRAY_BOOL(d, val);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
298 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
299 } else {
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
300 luaL_error(L, DBI_ERR_UNKNOWN_PUSH);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
301 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
302 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
303 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
304
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
305 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
306 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
307
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
308
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
309 static int next_iterator(lua_State *L) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
310 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
311 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
312
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
313 return statement_fetch_impl(L, statement, named_columns);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
314 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
315
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
316 /*
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
317 * iterfunc = statement:fetch(named_indexes)
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
318 */
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
319
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
320 static int statement_fetch(lua_State *L) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
321 if (lua_gettop(L) == 1) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
322 lua_pushvalue(L, 1);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
323 lua_pushboolean(L, 0);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
324 } else {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
325 lua_pushvalue(L, 1);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
326 lua_pushboolean(L, lua_toboolean(L, 2));
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
327 }
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
328
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
329 lua_pushcclosure(L, next_iterator, 2);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
330 return 1;
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
331 }
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
332
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
333 /*
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
334 * table = statement:row(named_indexes)
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
335 */
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
336 static int statement_row(lua_State *L) {
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
337 statement_t *statement = (statement_t *)luaL_checkudata(L, 1, DBD_POSTGRESQL_STATEMENT);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
338 int named_columns = lua_toboolean(L, 2);
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
339
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
340 return statement_fetch_impl(L, statement, named_columns);
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
341 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
342
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
343 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
344 * __gc
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
345 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
346 static int statement_gc(lua_State *L) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
347 /* always free the handle */
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
348 statement_close(L);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
349
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
350 return 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
351 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
352
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
353 int dbd_postgresql_statement_create(lua_State *L, connection_t *conn, const char *sql_query) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
354 statement_t *statement = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
355 ExecStatusType status;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
356 PGresult *result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
357 char *new_sql;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
358 char name[IDLEN];
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
359
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
360 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
361 * convert SQL string into a PSQL API compatible SQL statement
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
362 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
363 new_sql = replace_placeholders(L, sql_query);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
364
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
365 snprintf(name, IDLEN, "%017u", ++conn->statement_id);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
366
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
367 result = PQprepare(conn->postgresql, name, new_sql, 0, NULL);
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
368
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
369 /*
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
370 * free converted statement after use
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
371 */
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
372 free(new_sql);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
373
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
374 if (!result) {
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
375 lua_pushnil(L);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
376 lua_pushfstring(L, DBI_ERR_ALLOC_STATEMENT, PQerrorMessage(statement->postgresql));
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
377 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
378 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
379
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
380 status = PQresultStatus(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
381 if (status != PGRES_COMMAND_OK && status != PGRES_TUPLES_OK) {
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
382 const char *err_string = PQresultErrorMessage(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
383 PQclear(result);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
384
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
385 lua_pushnil(L);
4
c50b0e6f25d6 Clean up error messages for consistency.
nrich@ii.net
parents: 3
diff changeset
386 lua_pushfstring(L, DBI_ERR_PREP_STATEMENT, err_string);
3
b61020ca4753 Cleanup and 'assert' error handling.
nrich@ii.net
parents: 2
diff changeset
387 return 2;
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
388 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
389
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
390 PQclear(result);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
391
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
392 statement = (statement_t *)lua_newuserdata(L, sizeof(statement_t));
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
393 statement->postgresql = conn->postgresql;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
394 statement->result = NULL;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
395 statement->tuple = 0;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
396 strncpy(statement->name, name, IDLEN-1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
397 statement->name[IDLEN-1] = '\0';
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
398
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
399 luaL_getmetatable(L, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
400 lua_setmetatable(L, -2);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
401
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
402 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
403 }
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
404
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
405 int dbd_postgresql_statement(lua_State *L) {
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
406 static const luaL_Reg statement_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
407 {"close", statement_close},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
408 {"execute", statement_execute},
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
409 {"fetch", statement_fetch},
11
b3e05e361f46 Bugfix: PSQL array returns were not being indexed properly.
nrich@ii.net
parents: 10
diff changeset
410 {"row", statement_row},
2
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
411 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
412 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
413
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
414 static const luaL_Reg statement_class_methods[] = {
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
415 {NULL, NULL}
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
416 };
c4f02fc67e5a Cleanup and commenting
nrich@ii.net
parents: 1
diff changeset
417
1
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
418 luaL_newmetatable(L, DBD_POSTGRESQL_STATEMENT);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
419 luaL_register(L, 0, statement_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
420 lua_pushvalue(L,-1);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
421 lua_setfield(L, -2, "__index");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
422
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
423 lua_pushcfunction(L, statement_gc);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
424 lua_setfield(L, -2, "__gc");
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
425
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
426 luaL_register(L, DBD_POSTGRESQL_STATEMENT, statement_class_methods);
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
427
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
428 return 1;
408291a6eb3e Initial import.
nrich@ii.net
parents:
diff changeset
429 }

mercurial