diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2013-09-10 14:10:45 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-09-10 14:10:45 +0200 |
commit | a3372ca4e3eb1ba4e87dfa9ccb0c78c379935441 (patch) | |
tree | fda49b86acd9c9f79d0ea7bd9262ed6f5a41803e /odb/oracle/query.cxx | |
parent | 1d287936950aa96a7b4a12b0d05633f257ab2c90 (diff) |
Schema versioning support
Diffstat (limited to 'odb/oracle/query.cxx')
-rw-r--r-- | odb/oracle/query.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/odb/oracle/query.cxx b/odb/oracle/query.cxx index 9fbdc63..439d2c7 100644 --- a/odb/oracle/query.cxx +++ b/odb/oracle/query.cxx @@ -99,8 +99,8 @@ namespace odb // We don't want extra spaces after '(' as well as before ',' // and ')'. // - if (last != ' ' && last != '(' && - first != ' ' && first != ',' && first != ')') + if (last != ' ' && last != '\n' && last != '(' && + first != ' ' && first != '\n' && first != ',' && first != ')') s += ' '; s += q; @@ -184,7 +184,7 @@ namespace odb // It either has to be an exact match, or there should be // a whitespace following the keyword. // - if (s.size () == n || s[n] == ' ' || s[n] =='\t') + if (s.size () == n || s[n] == ' ' || s[n] == '\n' || s[n] =='\t') return true; } @@ -244,7 +244,7 @@ namespace odb { case clause_part::kind_column: { - if (last != ' ' && last != '(') + if (last != ' ' && last != '\n' && last != '(') r += ' '; r += i->part; @@ -252,7 +252,7 @@ namespace odb } case clause_part::kind_param: { - if (last != ' ' && last != '(') + if (last != ' ' && last != '\n' && last != '(') r += ' '; ostringstream os; @@ -283,8 +283,8 @@ namespace odb const string& p (i->part); char first (!p.empty () ? p[0] : ' '); - if (last != ' ' && last != '(' && - first != ' ' && first != ',' && first != ')') + if (last != ' ' && last != '\n' && last != '(' && + first != ' ' && first != '\n' && first != ',' && first != ')') r += ' '; r += p; @@ -292,7 +292,7 @@ namespace odb } case clause_part::kind_bool: { - if (last != ' ' && last != '(') + if (last != ' ' && last != '\n' && last != '(') r += ' '; // Oracle does not have TRUE and FALSE boolean literals (these |