summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2013-10-14 16:17:29 +0000
committerme_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac>2013-10-14 16:17:29 +0000
commit93ed010ceb623566e6e180272a18d38c5f5f17dc (patch)
tree154211994eaf8c07a085287cf51ed3b51a7f67e5
parent86846c2fe694f09b8d79d330968283c3a5cdf4d5 (diff)
downloadpica-pica-93ed010ceb623566e6e180272a18d38c5f5f17dc.tar.gz
pica-pica-93ed010ceb623566e6e180272a18d38c5f5f17dc.zip
fixed syntax error
git-svn-id: svn://localhost/project_picapica/trunk@286 fb96df88-216d-11de-830c-f3023f12d8ac
-rw-r--r--pica-client/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/pica-client/main.cpp b/pica-client/main.cpp
index cf51541..40b1cb0 100644
--- a/pica-client/main.cpp
+++ b/pica-client/main.cpp
@@ -347,7 +347,7 @@ static bool update_database()
goto showerror;
query.exec("insert into history select h.id, c.new_id, a.new_id, h.timestamp, h.is_me, h.is_delivered, h.message \
- from history_old_schemav1 as h, accounts_old_schemav1 as a, contacts_old_schemav1 as c on h.contact_id = c.id and h.account_id = a.id and a.id = c.account_id order by h.id where c.new_id is not null and a.new_id is not null");
+ from history_old_schemav1 as h, accounts_old_schemav1 as a, contacts_old_schemav1 as c on h.contact_id = c.id and h.account_id = a.id and a.id = c.account_id where c.new_id is not null and a.new_id is not null order by h.id");
if (query.lastError().isValid())
goto showerror;