From bb111ac2fdff909ed0f91d6f1f65c05aaf984936 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 5 Apr 2013 12:27:59 +0200 Subject: Add NOT NULL column without default value initially as NULL --- odb/relational/oracle/schema.cxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'odb/relational/oracle') diff --git a/odb/relational/oracle/schema.cxx b/odb/relational/oracle/schema.cxx index 024701c..9dc1921 100644 --- a/odb/relational/oracle/schema.cxx +++ b/odb/relational/oracle/schema.cxx @@ -349,13 +349,11 @@ namespace relational alter_column (base const& x): base (x) {} virtual void - traverse (sema_rel::alter_column& ac) + traverse (sema_rel::column& c) { - assert (ac.null_altered ()); - // Relax (NULL) in pre and tighten (NOT NULL) in post. // - if (pre_ != ac.null ()) + if (pre_ != c.null ()) return; if (first_) @@ -364,7 +362,7 @@ namespace relational os << "," << endl << " "; - os << quote_id (ac.name ()) << (ac.null () ? " NULL" : " NOT NULL"); + os << quote_id (c.name ()) << (c.null () ? " NULL" : " NOT NULL"); } }; entry alter_column_; @@ -386,7 +384,10 @@ namespace relational os << " ADD ("; instance cc (emitter (), stream (), format_); - trav_rel::unames n (*cc); + trav_rel::alter_column ac; // Override. + trav_rel::unames n; + n >> cc; + n >> ac; names (at, n); os << ")" << endl; -- cgit v1.1