From 87fd08a98063303d4d97e2bdac7b212ae5248914 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Thu, 27 Oct 2011 12:36:03 +0200 Subject: Revert to manually quoting Oracle identifiers where necessary --- common/view/driver.cxx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'common/view') diff --git a/common/view/driver.cxx b/common/view/driver.cxx index b671e46..f6dd613 100644 --- a/common/view/driver.cxx +++ b/common/view/driver.cxx @@ -59,7 +59,11 @@ view2_test (const auto_ptr& db) } { - result r (db->query (query::age + " < 31")); +#ifndef DATABASE_ORACLE + result r (db->query ("age < 31")); +#else + result r (db->query ("\"age\" < 31")); +#endif iterator i (r.begin ()); assert (i != r.end ()); @@ -87,10 +91,11 @@ view4_test (const auto_ptr& db) transaction t (db->begin ()); { - result r (db->query ( - (query::person::age > 30) + - "ORDER BY " + - query::person::age)); +#ifndef DATABASE_ORACLE + result r (db->query ((query::person::age > 30) + "ORDER BY age")); +#else + result r (db->query ((query::person::age > 30) + "ORDER BY \"age\"")); +#endif iterator i (r.begin ()); @@ -108,8 +113,7 @@ view4_test (const auto_ptr& db) { result r (db->query ( (query::person::age > 30) + - "ORDER BY " + - query::person::age)); + "ORDER BY " + query::person::age)); iterator i (r.begin ()); -- cgit v1.1