dbd/postgresql/statement.c

Fri, 19 Dec 2008 09:17:16 +0000

author
nrich@ii.net
date
Fri, 19 Dec 2008 09:17:16 +0000
changeset 21
7956401a0c5e
parent 20
5ab0b30f8fbd
child 30
8599f34c139b
permissions
-rw-r--r--

Added the statement:affected() and statement:rowcount() methods.

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

mercurial