From ee54a95bc8e86c9d64bd624e913893cd13c35e72 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Thu, 20 Oct 2011 10:27:04 +0200 Subject: Minimize Oracle schema_emitter implementation --- odb/relational/oracle/schema.cxx | 18 ++++-------------- odb/relational/schema.hxx | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/odb/relational/oracle/schema.cxx b/odb/relational/oracle/schema.cxx index acc512f..ff218cc 100644 --- a/odb/relational/oracle/schema.cxx +++ b/odb/relational/oracle/schema.cxx @@ -25,21 +25,10 @@ namespace relational schema_emitter (const base& x): base (x) {} virtual void - pre () - { - first_ = true; - } - - virtual void line (const std::string& l) { - if (first_) - first_ = false; - else - os << endl; - + base::line (l); last_ = l; - os << l; } virtual void @@ -49,7 +38,9 @@ namespace relational { if (last_ == "END;") os << endl - << '/' << endl; + << '/' << endl + << endl; + else os << ';' << endl << endl; @@ -57,7 +48,6 @@ namespace relational } private: - bool first_; string last_; }; entry schema_emitter_; diff --git a/odb/relational/schema.hxx b/odb/relational/schema.hxx index 2911c40..6c4cdee 100644 --- a/odb/relational/schema.hxx +++ b/odb/relational/schema.hxx @@ -73,7 +73,7 @@ namespace relational << endl; } - private: + protected: bool first_; }; -- cgit v1.1