diff options
-rw-r--r-- | odb/relational/mssql/schema.cxx | 16 | ||||
-rw-r--r-- | odb/relational/mysql/schema.cxx | 4 | ||||
-rw-r--r-- | odb/relational/oracle/schema.cxx | 22 | ||||
-rw-r--r-- | odb/relational/schema.hxx | 10 |
4 files changed, 24 insertions, 28 deletions
diff --git a/odb/relational/mssql/schema.cxx b/odb/relational/mssql/schema.cxx index 649ab13..7458d3e 100644 --- a/odb/relational/mssql/schema.cxx +++ b/odb/relational/mssql/schema.cxx @@ -427,9 +427,9 @@ namespace relational else pre_statement (); - alter_header (at.name ()); - os << endl + os << "ALTER TABLE " << quote_id (at.name ()) << endl << " DROP CONSTRAINT "; + instance<drop_foreign_key> dfc (*this); trav_rel::unames n (*dfc); names (at, n); @@ -449,8 +449,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); @@ -505,8 +505,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 COLUMN "; instance<drop_column> dc (*this); @@ -540,9 +540,9 @@ namespace relational else pre_statement (); - alter_header (at.name ()); - os << endl + os << "ALTER TABLE " << quote_id (at.name ()) << endl << " ADD "; + instance<create_foreign_key> cfc (*this); trav_rel::unames n (*cfc); names (at, n); diff --git a/odb/relational/mysql/schema.cxx b/odb/relational/mysql/schema.cxx index d1721fa..9b04e6b 100644 --- a/odb/relational/mysql/schema.cxx +++ b/odb/relational/mysql/schema.cxx @@ -367,7 +367,7 @@ namespace relational os << "/*" << endl; in_comment = true; - alter_header (at.name ()); + os << "ALTER TABLE " << quote_id (at.name ()); instance<drop_foreign_key> dfk (*this); trav_rel::unames n (*dfk); names (at, n); @@ -422,7 +422,7 @@ namespace relational os << "/*" << endl; in_comment = true; - alter_header (at.name ()); + os << "ALTER TABLE " << quote_id (at.name ()); instance<create_foreign_key> cfk (*this); trav_rel::unames n (*cfk); names (at, n); 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); diff --git a/odb/relational/schema.hxx b/odb/relational/schema.hxx index 7f1e1a0..df395b8 100644 --- a/odb/relational/schema.hxx +++ b/odb/relational/schema.hxx @@ -1202,12 +1202,6 @@ namespace relational return 0; } - virtual void - alter_header (sema_rel::qname const& table) - { - os << "ALTER TABLE " << quote_id (table); - } - void pass (unsigned short p) { @@ -1248,7 +1242,7 @@ namespace relational // statement. Quite a few databases don't support this. // pre_statement (); - alter_header (at.name ()); + os << "ALTER TABLE " << quote_id (at.name ()); bool f (true); // Shared first flag. bool* pf (&f); // (Im)perfect forwarding. @@ -1360,7 +1354,7 @@ namespace relational // statement. Quite a few databases don't support this. // pre_statement (); - alter_header (at.name ()); + os << "ALTER TABLE " << quote_id (at.name ()); bool f (true); // Shared first flag. bool* pf (&f); // (Im)perfect forwarding. |