From 7c2d91d07bbd32e81de6139776f0f5c5adbfb2ac Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 8 Apr 2013 14:28:19 +0200
Subject: Get rid of ALTER TABLE callback since it is the same for all
 databases

---
 odb/relational/oracle/schema.cxx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'odb/relational/oracle')

diff --git a/odb/relational/oracle/schema.cxx b/odb/relational/oracle/schema.cxx
index 3348d7d..68dab57 100644
--- a/odb/relational/oracle/schema.cxx
+++ b/odb/relational/oracle/schema.cxx
@@ -354,7 +354,8 @@ namespace relational
           if (check<sema_rel::drop_foreign_key> (at))
           {
             pre_statement ();
-            alter_header (at.name ());
+
+            os << "ALTER TABLE " << quote_id (at.name ());
 
             instance<drop_foreign_key> dfc (*this);
             trav_rel::unames n (*dfc);
@@ -367,8 +368,8 @@ namespace relational
           if (check<sema_rel::add_column> (at))
           {
             pre_statement ();
-            alter_header (at.name ());
-            os << endl
+
+            os << "ALTER TABLE " << quote_id (at.name ()) << endl
                << "  ADD (";
 
             instance<create_column> cc (*this);
@@ -382,8 +383,8 @@ namespace relational
           if (check_alter_column_null (at, true))
           {
             pre_statement ();
-            alter_header (at.name ());
-            os << endl
+
+            os << "ALTER TABLE " << quote_id (at.name ()) << endl
                << "  MODIFY (";
 
             bool tl (true); // (Im)perfect forwarding.
@@ -411,8 +412,8 @@ namespace relational
           if (check<sema_rel::drop_column> (at))
           {
             pre_statement ();
-            alter_header (at.name ());
-            os << endl
+
+            os << "ALTER TABLE " << quote_id (at.name ()) << endl
                << "  DROP (";
 
             instance<drop_column> dc (*this);
@@ -426,8 +427,8 @@ namespace relational
           if (check_alter_column_null (at, false))
           {
             pre_statement ();
-            alter_header (at.name ());
-            os << endl
+
+            os << "ALTER TABLE " << quote_id (at.name ()) << endl
                << "  MODIFY (";
 
             bool fl (false); // (Im)perfect forwarding.
@@ -442,7 +443,8 @@ namespace relational
           if (check<sema_rel::add_foreign_key> (at))
           {
             pre_statement ();
-            alter_header (at.name ());
+
+            os << "ALTER TABLE " << quote_id (at.name ());
 
             instance<create_foreign_key> cfc (*this);
             trav_rel::unames n (*cfc);
-- 
cgit v1.1