diff options
Diffstat (limited to 'pgsql/custom')
| -rw-r--r-- | pgsql/custom/driver.cxx | 7 | ||||
| -rw-r--r-- | pgsql/custom/query.hxx | 34 |
2 files changed, 21 insertions, 20 deletions
diff --git a/pgsql/custom/driver.cxx b/pgsql/custom/driver.cxx index f1f70f8..7188f74 100644 --- a/pgsql/custom/driver.cxx +++ b/pgsql/custom/driver.cxx @@ -18,14 +18,15 @@ #include "test-odb.hxx" using namespace std; -using namespace odb::core; +namespace pgsql = odb::pgsql; +using namespace pgsql; int main (int argc, char* argv[]) { try { - auto_ptr<database> db (create_database (argc, argv)); + auto_ptr<database> db (create_specific_database<database> (argc, argv)); object o (1); o.p = point (1.1111, 2222222222.2); @@ -61,7 +62,7 @@ main (int argc, char* argv[]) // Query. // - typedef odb::query<object> query; + typedef pgsql::query<object> query; typedef odb::result<object> result; { diff --git a/pgsql/custom/query.hxx b/pgsql/custom/query.hxx index 4b29b45..432d25b 100644 --- a/pgsql/custom/query.hxx +++ b/pgsql/custom/query.hxx @@ -34,18 +34,18 @@ namespace odb // is_null, is_not_null // public: - query + query_base is_null () const { - query q (table_, column_); + query_base q (table_, column_); q += "IS NULL"; return q; } - query + query_base is_not_null () const { - query q (table_, column_); + query_base q (table_, column_); q += "IS NOT NULL"; return q; } @@ -53,61 +53,61 @@ namespace odb // = // public: - query + query_base equal (const point& v) const { return equal (val_bind<point> (v)); } - query + query_base equal (val_bind<point> v) const { - query q (table_, column_); + query_base q (table_, column_); q += "~="; q.append<point, id_string> (v, conversion_); return q; } - query + query_base equal (ref_bind<point> r) const { - query q (table_, column_); + query_base q (table_, column_); q += "~="; q.append<point, id_string> (r, conversion_); return q; } - friend query + friend query_base operator== (const query_column& c, const point& v) { return c.equal (v); } - friend query + friend query_base operator== (const point& v, const query_column& c) { return c.equal (v); } - friend query + friend query_base operator== (const query_column& c, val_bind<point> v) { return c.equal (v); } - friend query + friend query_base operator== (val_bind<point> v, const query_column& c) { return c.equal (v); } - friend query + friend query_base operator== (const query_column& c, ref_bind<point> r) { return c.equal (r); } - friend query + friend query_base operator== (ref_bind<point> r, const query_column& c) { return c.equal (r); @@ -116,10 +116,10 @@ namespace odb // Column comparison. // public: - query + query_base operator== (const query_column<point, id_string>& c) const { - query q (table_, column_); + query_base q (table_, column_); q += "~="; q.append (c.table (), c.column ()); return q; |