From ac0fa531c7aba9d921068acfb7fceda054c5aa27 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 15 Mar 2013 12:40:52 +0200 Subject: Move type check to model creation instead of schema generation This way we make sure cxx-location is only used during model creation. As a result, we can now generate schema from a model instantiated from XML. --- odb/relational/pgsql/schema.cxx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'odb/relational/pgsql/schema.cxx') diff --git a/odb/relational/pgsql/schema.cxx b/odb/relational/pgsql/schema.cxx index 0885200..0a2b82d 100644 --- a/odb/relational/pgsql/schema.cxx +++ b/odb/relational/pgsql/schema.cxx @@ -4,7 +4,6 @@ #include -#include #include #include @@ -69,19 +68,12 @@ namespace relational // sql_type const& t (parse_sql_type (c.type ())); + // The model creation code makes sure it is one of these type. + // if (t.type == sql_type::INTEGER) os << "SERIAL"; else if (t.type == sql_type::BIGINT) os << "BIGSERIAL"; - else - { - location const& l (c.get ("cxx-location")); - - error (l) << "automatically assigned object id must map " - << "to PostgreSQL INTEGER or BIGINT" << endl; - - throw operation_failed (); - } } else base::type (c, auto_); -- cgit v1.1