From eba1738e205e6047dad2c3df9648c65c7fb0f053 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 19 Oct 2011 10:55:36 +0200
Subject: Use base implementation instead of duplicating code

---
 odb/relational/mysql/schema.cxx | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'odb/relational/mysql')

diff --git a/odb/relational/mysql/schema.cxx b/odb/relational/mysql/schema.cxx
index 8b31563..485fa9f 100644
--- a/odb/relational/mysql/schema.cxx
+++ b/odb/relational/mysql/schema.cxx
@@ -44,17 +44,15 @@ namespace relational
         virtual void
         null (semantics::data_member& m)
         {
-          if (!context::null (m, prefix_))
-            os << " NOT NULL";
+          // MySQL TIMESTAMP is by default NOT NULL. If we want it
+          // to contain NULL values, we need to explicitly declare
+          // the column as NULL.
+          //
+          if (context::null (m, prefix_) &&
+              column_sql_type (m, prefix_).type == sql_type::TIMESTAMP)
+            os << " NULL";
           else
-          {
-            // MySQL TIMESTAMP is by default NOT NULL. If we want it
-            // to contain NULL values, we need to explicitly declare
-            // the column as NULL.
-            //
-            if (column_sql_type (m, prefix_).type == sql_type::TIMESTAMP)
-              os << " NULL";
-          }
+            base::null (m);
         }
 
         virtual void
-- 
cgit v1.1