author | Tero Marttila <terom@fixme.fi> |
Thu, 20 Nov 2008 01:16:24 +0200 | |
branch | new-evsql |
changeset 44 | 9e76ee9729b6 |
child 45 | 424ce5ab82fd |
permissions | -rw-r--r-- |
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
1 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
2 |
#include "evsql.h" |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
3 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
4 |
const char *evsql_result_error (const struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
5 |
if (!res->error) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
6 |
return "No error"; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
7 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
8 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
9 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
10 |
if (!res->result.pq) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
11 |
return "unknown error (no result)"; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
12 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
13 |
return PQresultErrorMessage(res->result.pq); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
14 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
15 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
16 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
17 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
18 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
19 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
20 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
21 |
size_t evsql_result_rows (const struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
22 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
23 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
24 |
return PQntuples(res->result.pq); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
25 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
26 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
27 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
28 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
29 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
30 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
31 |
size_t evsql_result_cols (const struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
32 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
33 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
34 |
return PQnfields(res->result.pq); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
35 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
36 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
37 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
38 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
39 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
40 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
41 |
size_t evsql_result_affected (const struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
42 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
43 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
44 |
return strtol(PQcmdTuples(res->result.pq), NULL, 10); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
45 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
46 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
47 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
48 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
49 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
50 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
51 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
52 |
int evsql_result_null (const struct evsql_result *res, size_t row, size_t col) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
53 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
54 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
55 |
return PQgetisnull(res->result.pq, row, col); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
56 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
57 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
58 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
59 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
60 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
61 |
error: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
62 |
return -1; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
63 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
64 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
65 |
int evsql_result_field (const struct evsql_result *res, size_t row, size_t col, const char **ptr, size_t *size) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
66 |
*ptr = NULL; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
67 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
68 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
69 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
70 |
if (PQfformat(res->result.pq, col) != 1) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
71 |
ERROR("[%zu:%zu] PQfformat is not binary: %d", row, col, PQfformat(res->result.pq, col)); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
72 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
73 |
*size = PQgetlength(res->result.pq, row, col); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
74 |
*ptr = PQgetvalue(res->result.pq, row, col); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
75 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
76 |
return 0; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
77 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
78 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
79 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
80 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
81 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
82 |
error: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
83 |
return -1; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
84 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
85 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
86 |
err_t evsql_result_begin (struct evsql_result_info *info, struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
87 |
struct evsql_item_info *col; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
88 |
size_t cols = 0, nrows; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
89 |
err_t err; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
90 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
91 |
// count info columns |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
92 |
for (col = info->columns; col->type; col++) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
93 |
cols++; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
94 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
95 |
// number of rows returned/affected |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
96 |
nrows = evsql_result_rows(res) || evsql_result_affected(res); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
97 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
98 |
// did the query fail outright? |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
99 |
if (res->error) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
100 |
// dump error message |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
101 |
NXERROR(err = EIO, evsql_result_error(res)); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
102 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
103 |
/* |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
104 |
// SELECT/DELETE/UPDATE WHERE didn't match any rows -> ENOENT |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
105 |
if (nrows == 0) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
106 |
XERROR(err = ENOENT, "no rows returned/affected"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
107 |
*/ |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
108 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
109 |
// correct number of columns |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
110 |
if (evsql_result_cols(res) != cols) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
111 |
XERROR(err = EINVAL, "wrong number of columns: %zu -> %zu", cols, evsql_result_cols(res)); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
112 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
113 |
// assign |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
114 |
res->info = info; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
115 |
res->row_offset = 0; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
116 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
117 |
// good |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
118 |
return 0; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
119 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
120 |
error: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
121 |
return err; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
122 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
123 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
124 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
125 |
int evsql_result_next (struct evsql_result *res, ...) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
126 |
va_list vargs; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
127 |
struct evsql_item_info *col; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
128 |
size_t col_idx, row_idx = res->row_offset; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
129 |
int err; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
130 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
131 |
// check if we're past the end |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
132 |
if (row_idx >= evsql_result_rows(res)) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
133 |
return 0; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
134 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
135 |
// varargs |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
136 |
va_start(vargs); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
137 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
138 |
for (col = info->columns, col_idx = 0; col->type; col++, col_idx++) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
139 |
char *value = NULL; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
140 |
size_t length = 0; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
141 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
142 |
// check for NULLs, then try and get the field value |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
143 |
if (evsql_result_null(res, row_idx, col_idx)) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
144 |
if (!col->flags.null_ok) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
145 |
XERROR(err = EINVAL, "r%zu:c%zu: NULL", row_idx, col_idx); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
146 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
147 |
} else if (evsql_result_field(row_idx, col_idx, &value, &length)) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
148 |
EERROR(err = EINVAL); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
149 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
150 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
151 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
152 |
// read the arg |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
153 |
switch (col->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
154 |
case EVSQL_TYPE_BINARY: { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
155 |
struct evsql_item_binary *item_ptr = va_arg(vargs, struct evsql_item_binary *); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
156 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
157 |
if (value) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
158 |
item_ptr->ptr = value; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
159 |
item_ptr->len = length; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
160 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
161 |
} break; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
162 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
163 |
case EVSQL_TYPE_STRING: { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
164 |
char **str_ptr = va_arg(vargs, char **); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
165 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
166 |
if (value) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
167 |
*str_ptr = value; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
168 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
169 |
} break; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
170 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
171 |
case EVSQL_TYPE_UINT16: { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
172 |
uint16_t *uval_ptr = va_arg(vars, uint16_t *); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
173 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
174 |
if (value) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
175 |
if (length != sizeof(uint16_t)) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
176 |
XERROR(err = EINVAL, "r%zu:c%zu: wrong size for uint16_t: %zu", row_idx, col_idx, length); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
177 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
178 |
int16_t sval = ntohs(*((int16_t *) value)); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
179 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
180 |
if (sval < 0) |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
181 |
XERROR(err = ERANGE, "r%zu:c%zu: out of range for uint16_t: %d", row_idx, col_idx, sval); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
182 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
183 |
*uval_ptr = sval; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
184 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
185 |
} break; |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
186 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
187 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
188 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
189 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
190 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
191 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
192 |
void evsql_result_end (struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
193 |
// not much more to it... |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
194 |
evsql_result_free(res); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
195 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
196 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
197 |
void evsql_result_free (struct evsql_result *res) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
198 |
switch (res->evsql->type) { |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
199 |
case EVSQL_EVPQ: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
200 |
return PQclear(res->result.pq); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
201 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
202 |
default: |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
203 |
FATAL("res->evsql->type"); |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
204 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
205 |
} |
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
206 |
|
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
207 |