aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--odb/pgsql/query.cxx25
-rw-r--r--odb/pgsql/query.hxx99
-rw-r--r--odb/pgsql/query.txx15
3 files changed, 77 insertions, 62 deletions
diff --git a/odb/pgsql/query.cxx b/odb/pgsql/query.cxx
index 856c031..6739b06 100644
--- a/odb/pgsql/query.cxx
+++ b/odb/pgsql/query.cxx
@@ -153,11 +153,9 @@ namespace odb
}
void query::
- append (const string& q, clause_part::kind_type k)
+ append (const string& q)
{
- if (k == clause_part::native &&
- !clause_.empty () &&
- clause_.back ().kind == clause_part::native)
+ if (!clause_.empty () && clause_.back ().kind == clause_part::native)
{
string& s (clause_.back ().part);
@@ -174,7 +172,19 @@ namespace odb
s += q;
}
else
- clause_.push_back (clause_part (k, q));
+ clause_.push_back (clause_part (clause_part::native, q));
+ }
+
+ void query::
+ append (const char* table, const char* column)
+ {
+ string s ("\"");
+ s += table;
+ s += "\".\"";
+ s += column;
+ s += '"';
+
+ clause_.push_back (clause_part (clause_part::column, s));
}
void query::
@@ -250,7 +260,7 @@ namespace odb
}
string query::
- clause (string const& table) const
+ clause () const
{
string r;
size_t param (1);
@@ -267,9 +277,6 @@ namespace odb
if (last != ' ' && last != '(')
r += ' ';
- if (i->part[0] == '.')
- r += table;
-
r += i->part;
break;
}
diff --git a/odb/pgsql/query.hxx b/odb/pgsql/query.hxx
index 7633cc4..7fd66d7 100644
--- a/odb/pgsql/query.hxx
+++ b/odb/pgsql/query.hxx
@@ -111,11 +111,16 @@ namespace odb
}
explicit
- query (const std::string& q,
- clause_part::kind_type k = clause_part::native)
+ query (const std::string& native)
: binding_ (0, 0), native_binding_ (0, 0, 0, 0)
{
- clause_.push_back (clause_part (k, q));
+ clause_.push_back (clause_part (clause_part::native, native));
+ }
+
+ query (const char* table, const char* column)
+ : binding_ (0, 0), native_binding_ (0, 0, 0, 0)
+ {
+ append (table, column);
}
template <typename T>
@@ -144,7 +149,7 @@ namespace odb
public:
std::string
- clause (std::string const& default_table) const;
+ clause () const;
native_binding&
parameters_binding () const;
@@ -183,7 +188,7 @@ namespace odb
query&
operator+= (const std::string& q)
{
- append (q, clause_part::native);
+ append (q);
return *this;
}
@@ -213,7 +218,10 @@ namespace odb
append (ref_bind<T>);
void
- append (const std::string&, clause_part::kind_type);
+ append (const std::string& native);
+
+ void
+ append (const char* table, const char* column);
private:
void
@@ -387,16 +395,23 @@ namespace odb
template <typename T, database_type_id ID>
struct query_column
{
- explicit
- query_column (const char* name)
- : name_ (name)
+ // Note that we keep shalow copies of the table and column names.
+ //
+ query_column (const char* table, const char* column)
+ : table_ (table), column_ (column)
{
}
const char*
- name () const
+ table () const
{
- return name_;
+ return table_;
+ }
+
+ const char*
+ column () const
+ {
+ return column_;
}
// is_null, is_not_null
@@ -405,7 +420,7 @@ namespace odb
query
is_null () const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IS NULL";
return q;
}
@@ -413,7 +428,7 @@ namespace odb
query
is_not_null () const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IS NOT NULL";
return q;
}
@@ -449,7 +464,7 @@ namespace odb
query
equal (val_bind<T> v) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "=";
q.append<T, ID> (v);
return q;
@@ -466,7 +481,7 @@ namespace odb
query
equal (ref_bind<T> r) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "=";
q.append<T, ID> (r);
return q;
@@ -534,7 +549,7 @@ namespace odb
query
unequal (val_bind<T> v) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "!=";
q.append<T, ID> (v);
return q;
@@ -551,7 +566,7 @@ namespace odb
query
unequal (ref_bind<T> r) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "!=";
q.append<T, ID> (r);
return q;
@@ -619,7 +634,7 @@ namespace odb
query
less (val_bind<T> v) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "<";
q.append<T, ID> (v);
return q;
@@ -636,7 +651,7 @@ namespace odb
query
less (ref_bind<T> r) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "<";
q.append<T, ID> (r);
return q;
@@ -704,7 +719,7 @@ namespace odb
query
greater (val_bind<T> v) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += ">";
q.append<T, ID> (v);
return q;
@@ -721,7 +736,7 @@ namespace odb
query
greater (ref_bind<T> r) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += ">";
q.append<T, ID> (r);
return q;
@@ -789,7 +804,7 @@ namespace odb
query
less_equal (val_bind<T> v) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "<=";
q.append<T, ID> (v);
return q;
@@ -806,7 +821,7 @@ namespace odb
query
less_equal (ref_bind<T> r) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "<=";
q.append<T, ID> (r);
return q;
@@ -874,7 +889,7 @@ namespace odb
query
greater_equal (val_bind<T> v) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += ">=";
q.append<T, ID> (v);
return q;
@@ -891,7 +906,7 @@ namespace odb
query
greater_equal (ref_bind<T> r) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += ">=";
q.append<T, ID> (r);
return q;
@@ -958,9 +973,9 @@ namespace odb
//
(void) (sizeof (type_instance<T> () == type_instance<T2> ()));
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "=";
- q.append (c.name (), query::clause_part::column);
+ q.append (c.table (), c.column ());
return q;
}
@@ -972,9 +987,9 @@ namespace odb
//
(void) (sizeof (type_instance<T> () != type_instance<T2> ()));
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "!=";
- q.append (c.name (), query::clause_part::column);
+ q.append (c.table (), c.column ());
return q;
}
@@ -986,9 +1001,9 @@ namespace odb
//
(void) (sizeof (type_instance<T> () < type_instance<T2> ()));
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "<";
- q.append (c.name (), query::clause_part::column);
+ q.append (c.table (), c.column ());
return q;
}
@@ -1000,9 +1015,9 @@ namespace odb
//
(void) (sizeof (type_instance<T> () > type_instance<T2> ()));
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += ">";
- q.append (c.name (), query::clause_part::column);
+ q.append (c.table (), c.column ());
return q;
}
@@ -1014,9 +1029,9 @@ namespace odb
//
(void) (sizeof (type_instance<T> () <= type_instance<T2> ()));
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "<=";
- q.append (c.name (), query::clause_part::column);
+ q.append (c.table (), c.column ());
return q;
}
@@ -1028,14 +1043,15 @@ namespace odb
//
(void) (sizeof (type_instance<T> () >= type_instance<T2> ()));
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += ">=";
- q.append (c.name (), query::clause_part::column);
+ q.append (c.table (), c.column ());
return q;
}
private:
- const char* name_;
+ const char* table_;
+ const char* column_;
};
//
@@ -1715,13 +1731,6 @@ namespace odb
: query_selector<T>::type (qc)
{
}
-
- std::string
- clause () const
- {
- return query_selector<T>::type::clause (
- query_selector<T>::table_name ());
- }
};
}
diff --git a/odb/pgsql/query.txx b/odb/pgsql/query.txx
index 6fdc4fe..43d6da0 100644
--- a/odb/pgsql/query.txx
+++ b/odb/pgsql/query.txx
@@ -15,12 +15,11 @@ namespace odb
query (const query_column<bool, ID>& c)
: binding_ (0, 0), native_binding_ (0, 0, 0, 0)
{
- clause_.push_back (clause_part (clause_part::column, c.name ()));
-
// Cannot use IS TRUE here since database type can be a non-
// integral type.
//
- clause_.push_back (clause_part (clause_part::native, "="));
+ append (c.table (), c.column ());
+ append ("=");
append<bool, ID> (val_bind<bool> (true));
}
@@ -30,7 +29,7 @@ namespace odb
query query_column<T, ID>::
in (const T& v1, const T& v2) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IN (";
q.append<T, ID> (val_bind<T> (v1));
q += ",";
@@ -43,7 +42,7 @@ namespace odb
query query_column<T, ID>::
in (const T& v1, const T& v2, const T& v3) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IN (";
q.append<T, ID> (val_bind<T> (v1));
q += ",";
@@ -58,7 +57,7 @@ namespace odb
query query_column<T, ID>::
in (const T& v1, const T& v2, const T& v3, const T& v4) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IN (";
q.append<T, ID> (val_bind<T> (v1));
q += ",";
@@ -75,7 +74,7 @@ namespace odb
query query_column<T, ID>::
in (const T& v1, const T& v2, const T& v3, const T& v4, const T& v5) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IN (";
q.append<T, ID> (val_bind<T> (v1));
q += ",";
@@ -95,7 +94,7 @@ namespace odb
query query_column<T, ID>::
in_range (I begin, I end) const
{
- query q (name_, query::clause_part::column);
+ query q (table_, column_);
q += "IN (";
for (I i (begin); i != end; ++i)
generated by cgit v1.1 at 2024-11-10 07:44:38 +0000