From ffdc07d3242e7e9d93f33eb3dc7c294ef79698ff Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 8 Apr 2013 11:38:51 +0200
Subject: Write NULL/NOT NULL before DEFAULT in generated schemas

This way we avoid DEFAULT NULL NULL, except for Oracle which insists on a
specific order.
---
 odb/relational/oracle/schema.cxx | 20 ++++++++++++++++++++
 odb/relational/schema.hxx        | 15 ++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/odb/relational/oracle/schema.cxx b/odb/relational/oracle/schema.cxx
index 298280e..5d0c107 100644
--- a/odb/relational/oracle/schema.cxx
+++ b/odb/relational/oracle/schema.cxx
@@ -214,6 +214,26 @@ namespace relational
 
           create (ac);
         }
+
+        virtual void
+        constraints (sema_rel::column& c, sema_rel::primary_key* pk)
+        {
+          // Oracle wants DEFAULT before NULL even though we can end
+          // up with mouthfulls like DEFAULT NULL NULL.
+          //
+          if (!c.default_ ().empty ())
+            os << " DEFAULT " << c.default_ ();
+
+          null (c);
+
+          // If this is a single-column primary key, generate it inline.
+          //
+          if (pk != 0 && pk->contains_size () == 1)
+            primary_key ();
+
+          if (pk != 0 && pk->auto_ ())
+            auto_ (c);
+        }
       };
       entry<create_column> create_column_;
 
diff --git a/odb/relational/schema.hxx b/odb/relational/schema.hxx
index 247dca2..ed0084e 100644
--- a/odb/relational/schema.hxx
+++ b/odb/relational/schema.hxx
@@ -515,12 +515,20 @@ namespace relational
         os << quote_id (c.name ()) << " ";
 
         type (c, pk != 0 && pk->auto_ ());
+        constraints (c, pk);
 
-        if (!c.default_ ().empty ())
-          os << " DEFAULT " << c.default_ ();
+        if (!c.options ().empty ())
+          os << " " << c.options ();
+      }
 
+      virtual void
+      constraints (sema_rel::column& c, sema_rel::primary_key* pk)
+      {
         null (c);
 
+        if (!c.default_ ().empty ())
+          os << " DEFAULT " << c.default_ ();
+
         // If this is a single-column primary key, generate it inline.
         //
         if (pk != 0 && pk->contains_size () == 1)
@@ -528,9 +536,6 @@ namespace relational
 
         if (pk != 0 && pk->auto_ ())
           auto_ (c);
-
-        if (!c.options ().empty ())
-          os << " " << c.options ();
       }
 
       virtual void
-- 
cgit v1.1