diff options
author | Constantin Michael <constantin@codesynthesis.com> | 2011-10-20 10:24:37 +0200 |
---|---|---|
committer | Constantin Michael <constantin@codesynthesis.com> | 2011-10-21 11:47:14 +0200 |
commit | dbf411c52792587786b2f258ffda18bff0c3a8c5 (patch) | |
tree | c0ad3273adff15a707a8a7ea5de59ddab50ecc02 | |
parent | 73fdd6104f02ed6fad4e67f86e1ba2760d767844 (diff) |
Use cached auto_id flag to determine presence of auto increment column
-rw-r--r-- | odb/relational/header.hxx | 2 | ||||
-rw-r--r-- | odb/relational/source.hxx | 27 |
2 files changed, 7 insertions, 22 deletions
diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx index b0deeee..2416f04 100644 --- a/odb/relational/header.hxx +++ b/odb/relational/header.hxx @@ -975,7 +975,7 @@ namespace relational " id_type;" << endl << "static const bool auto_id = " << - (id_member (c)->count ("auto") ? "true;" : "false;") + (auto_id ? "true;" : "false;") << endl; os << "struct id_image_type" diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index e0b83d2..52303ee 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -385,7 +385,7 @@ namespace relational line += i->table; if (!i->alias.empty ()) - line += " AS " + i->alias; + line += (use_as ? " AS " : " ") + i->alias; line += " ON "; line += i->cond; @@ -3181,10 +3181,7 @@ namespace relational l += quote_id (i->orig_name); if (!i->alias.empty ()) - { - l += " AS "; - l += quote_id (i->alias); - } + l += (use_as ? " AS " : " ") + quote_id (i->alias); os << "r += " << strlit (l) << ";" << endl; @@ -3196,10 +3193,7 @@ namespace relational l += quote_id (i->orig_name); if (!i->alias.empty ()) - { - l += " AS "; - l += quote_id (i->alias); - } + l += (use_as ? " AS " : " ") + quote_id (i->alias); expression e ( translate_expression ( @@ -3240,10 +3234,7 @@ namespace relational l += table_qname (*i->obj); if (!i->alias.empty ()) - { - l += " AS "; - l += quote_id (i->alias); - } + l += (use_as ? " AS " : " ") + quote_id (i->alias); os << "r += " << strlit (l) << ";" << endl; @@ -3263,10 +3254,7 @@ namespace relational l += table_qname (*i->obj); if (!i->alias.empty ()) - { - l += " AS "; - l += quote_id (i->alias); - } + l += (use_as ? " AS " : " ") + quote_id (i->alias); l += " ON"; @@ -3480,10 +3468,7 @@ namespace relational l += table_qname (*i->obj); if (!i->alias.empty ()) - { - l += " AS "; - l += quote_id (i->alias); - } + l += (use_as ? " AS " : " ") + quote_id (i->alias); l += " ON"; os << "r += " << strlit (l) << ";"; |