diff options
-rw-r--r-- | odb/relational/mysql/schema.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
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 |