1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
|
$NetBSD: patch-am,v 1.1 2004/11/24 22:35:25 kristerw Exp $
--- lib/qof/qofsql.c.orig Wed Nov 24 18:11:27 2004
+++ lib/qof/qofsql.c Wed Nov 24 18:25:14 2004
@@ -155,8 +155,9 @@
if (('\'' == str[0]) ||
('\"' == str[0]))
{
+ size_t len;
str ++;
- size_t len = strlen(str);
+ len = strlen(str);
str[len-1] = 0;
}
return str;
@@ -168,6 +169,15 @@
char tmpbuff[128];
GSList *param_list;
QofQueryPredData *pred_data = NULL;
+ QofQueryCompare qop;
+ char *table_name;
+ char *param_name;
+ sql_field_item * sparam;
+ char * qparam_name;
+ sql_field_item * svalue;
+ char * qvalue_name;
+ QofType param_type;
+ QofQuery *qq;
if (NULL == cond)
{
@@ -183,14 +193,14 @@
PWARN("missing left paramter");
return NULL;
}
- sql_field_item * sparam = cond->d.pair.left->item;
+ sparam = cond->d.pair.left->item;
if (SQL_name != sparam->type)
{
PWARN("we support only paramter names at this time (parsed %d)",
sparam->type);
return NULL;
}
- char * qparam_name = sparam->d.name->data;
+ qparam_name = sparam->d.name->data;
if (NULL == qparam_name)
{
PWARN ("missing paramter name");
@@ -205,13 +215,13 @@
PWARN ("missing right paramter");
return NULL;
}
- sql_field_item * svalue = cond->d.pair.right->item;
+ svalue = cond->d.pair.right->item;
if (SQL_name != svalue->type)
{
PWARN("we support only simple values (parsed as %d)", svalue->type);
return NULL;
}
- char * qvalue_name = svalue->d.name->data;
+ qvalue_name = svalue->d.name->data;
if (NULL == qvalue_name)
{
PWARN("missing value");
@@ -224,16 +234,18 @@
* If it is, look up the value. */
if (0 == strncasecmp (qvalue_name, "kvp://", 6))
{
+ KvpValue *kv;
+ KvpValueType kvt;
if (NULL == query->kvp_join)
{
PWARN ("missing kvp frame");
return NULL;
}
- KvpValue *kv = kvp_frame_get_value (query->kvp_join, qvalue_name+5);
+ kv = kvp_frame_get_value (query->kvp_join, qvalue_name+5);
/* If there's no value, its not an error;
* we just don't do this predicate */
if (!kv) return NULL;
- KvpValueType kvt = kvp_value_get_type (kv);
+ kvt = kvp_value_get_type (kv);
tmpbuff[0] = 0x0;
qvalue_name = tmpbuff;
@@ -273,7 +285,6 @@
param_list = qof_query_build_param_list (qparam_name, NULL);
/* Get the where-term comparison operator */
- QofQueryCompare qop;
switch (cond->op)
{
case SQL_eq: qop = QOF_COMPARE_EQUAL; break;
@@ -292,8 +303,6 @@
/* OK, need to know the type of the thing being matched
* in order to build the correct predicate. Get the type
* from the object parameters. */
- char *table_name;
- char *param_name;
get_table_and_param (qparam_name, &table_name, ¶m_name);
if (NULL == table_name)
{
@@ -306,7 +315,7 @@
return NULL;
}
- QofType param_type = qof_class_get_parameter_type (table_name, param_name);
+ param_type = qof_class_get_parameter_type (table_name, param_name);
if (!param_type) return NULL; /* Can't happen */
if (!strcmp (param_type, QOF_TYPE_STRING))
@@ -343,19 +352,20 @@
}
else if (!strcmp (param_type, QOF_TYPE_DATE))
{
+ time_t exact;
+ int rc;
+ Timespec ts;
// XXX FIXME: this doesn't handle time strings, only date strings
// XXX should also see if we need to do a day-compare or time-compare.
/* work around highly bogus locale setting */
qof_date_format_set(QOF_DATE_FORMAT_US);
- time_t exact;
- int rc = qof_scan_date_secs (qvalue_name, &exact);
+ rc = qof_scan_date_secs (qvalue_name, &exact);
if (0 == rc)
{
PWARN ("unable to parse date: %s", qvalue_name);
return NULL;
}
- Timespec ts;
ts.tv_sec = exact;
ts.tv_nsec = 0;
pred_data = qof_query_date_predicate (qop, QOF_DATE_MATCH_DAY, ts);
@@ -375,6 +385,7 @@
}
else if (!strcmp (param_type, QOF_TYPE_GUID))
{
+ GList *guid_list;
GUID *guid = guid_malloc();
gboolean rc = string_to_guid (qvalue_name, guid);
if (0 == rc)
@@ -386,7 +397,7 @@
// XXX match any means eqal, what about not equal ??
// XXX less, than greater than don't make sense,
// should check for those bad conditions
- GList *guid_list = g_list_append (NULL, guid);
+ guid_list = g_list_append (NULL, guid);
pred_data = qof_query_guid_predicate (QOF_GUID_MATCH_ANY, guid_list);
// XXX FIXME the above is a memory leak! we leak both guid and glist.
}
@@ -404,7 +415,7 @@
return NULL;
}
- QofQuery *qq = qof_query_create();
+ qq = qof_query_create();
qof_query_add_term (qq, param_list, pred_data, QOF_QUERY_FIRST_TERM);
return qq;
}
@@ -418,11 +429,12 @@
{
case SQL_pair:
{
+ QofQuery * qq;
+ QofQueryOp qop;
QofQuery *qleft = handle_where (query, swear->d.pair.left);
QofQuery *qright = handle_where (query, swear->d.pair.right);
if (NULL == qleft) return qright;
if (NULL == qright) return qleft;
- QofQueryOp qop;
switch (swear->d.pair.op)
{
case SQL_and: qop = QOF_QUERY_AND; break;
@@ -433,7 +445,7 @@
qof_query_destroy (qright);
return NULL;
}
- QofQuery * qq = qof_query_merge (qleft, qright, qop);
+ qq = qof_query_merge (qleft, qright, qop);
qof_query_destroy (qleft);
qof_query_destroy (qright);
return qq;
@@ -460,12 +472,11 @@
static void
handle_sort_order (QofSqlQuery *query, GList *sorder_list)
{
- if (!sorder_list) return;
-
GSList *qsp[3];
gboolean direction[3];
int i;
+ if (!sorder_list) return;
for (i=0; i<3; i++)
{
qsp[i] = NULL;
@@ -473,14 +484,16 @@
if (sorder_list)
{
+ char * qparam_name;
+ GList *n;
sql_order_field *sorder = sorder_list->data;
/* Set the sort direction */
if (SQL_asc == sorder->order_type) direction[i] = TRUE;
/* Find the paramter name */
- char * qparam_name = NULL;
- GList *n = sorder->name;
+ qparam_name = NULL;
+ n = sorder->name;
if (n)
{
qparam_name = n->data;
@@ -509,6 +522,10 @@
qof_sql_query_run (QofSqlQuery *query, const char *str)
{
GList *node;
+ GList *tables;
+ sql_select_statement *sss;
+ sql_where * swear;
+ GList *results;
if (!query) return NULL;
query->parse_result = sql_parse (str);
@@ -531,14 +548,14 @@
* user wrote "SELECT * FROM tableA, tableB WHERE ..."
* then we don't have a single unique table-name.
*/
- GList *tables = sql_statement_get_tables (query->parse_result);
+ tables = sql_statement_get_tables (query->parse_result);
if (1 == g_list_length (tables))
{
query->single_global_tablename = tables->data;
}
- sql_select_statement *sss = query->parse_result->statement;
- sql_where * swear = sss->where;
+ sss = query->parse_result->statement;
+ swear = sss->where;
if (swear)
{
/* Walk over the where terms, turn them into QOF predicates */
@@ -562,7 +579,7 @@
qof_query_set_book (query->qof_query, query->book);
// qof_query_print (query->qof_query);
- GList *results = qof_query_run (query->qof_query);
+ results = qof_query_run (query->qof_query);
return results;
}
|
