From 1d98f0160da68be27dcb46ae653e6cc4692a5bbe Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 19 Sep 2011 16:52:01 +0200 Subject: Rename generation_failed exception to operation_failed A more generic name is required since it is now used in both generator and processor (and in the future may be used validator). --- odb/context.hxx | 2 +- odb/generator.cxx | 2 +- odb/include.cxx | 6 +- odb/processor.cxx | 2 +- odb/relational/mysql/context.cxx | 16 +++--- odb/relational/mysql/schema.cxx | 4 +- odb/relational/pgsql/context.cxx | 18 +++--- odb/relational/pgsql/schema.cxx | 4 +- odb/relational/processor.cxx | 118 +++++++++++++++++++------------------- odb/relational/processor.hxx | 2 +- odb/relational/source.cxx | 12 ++-- odb/relational/source.hxx | 12 ++-- odb/relational/sqlite/context.cxx | 12 ++-- odb/relational/sqlite/schema.cxx | 2 +- 14 files changed, 106 insertions(+), 106 deletions(-) diff --git a/odb/context.hxx b/odb/context.hxx index 8f77645..550b64e 100644 --- a/odb/context.hxx +++ b/odb/context.hxx @@ -38,7 +38,7 @@ typedef std::vector regex_mapping; // // -class generation_failed {}; +class operation_failed {}; // Keep this enum synchronized with the one in libodb/odb/pointer-traits.hxx. // diff --git a/odb/generator.cxx b/odb/generator.cxx index 50abbe9..683834c 100644 --- a/odb/generator.cxx +++ b/odb/generator.cxx @@ -389,7 +389,7 @@ generate (options const& ops, semantics::unit& unit, path const& p) auto_rm.cancel (); } - catch (generation_failed const&) + catch (operation_failed const&) { // Code generation failed. Diagnostics has already been issued. // diff --git a/odb/include.cxx b/odb/include.cxx index 16842c8..1c143f4 100644 --- a/odb/include.cxx +++ b/odb/include.cxx @@ -188,7 +188,7 @@ namespace if (!is.is_open ()) { cerr << "error: unable to open '" << f << "' in read mode" << endl; - throw generation_failed (); + throw operation_failed (); } parse_stream (is, f, lines); @@ -244,7 +244,7 @@ namespace { cerr << name << ":" << lb << ":1: error: " << "unable to parse #include directive" << endl; - throw generation_failed (); + throw operation_failed (); } } } @@ -277,7 +277,7 @@ namespace if (is.bad () || (is.fail () && !is.eof ())) { cerr << "error: input error while reading '" << name << "'" << endl; - throw generation_failed (); + throw operation_failed (); } } diff --git a/odb/processor.cxx b/odb/processor.cxx index 601b6c1..4ace44b 100644 --- a/odb/processor.cxx +++ b/odb/processor.cxx @@ -25,7 +25,7 @@ process (options const& ops, semantics::unit& unit, semantics::path const&) relational::process (); } } - catch (generation_failed const&) + catch (operation_failed const&) { // Processing failed. Diagnostics has already been issued. // diff --git a/odb/relational/mysql/context.cxx b/odb/relational/mysql/context.cxx index 59b93ba..891f448 100644 --- a/odb/relational/mysql/context.cxx +++ b/odb/relational/mysql/context.cxx @@ -575,7 +575,7 @@ namespace relational else cerr << " error: expected MySQL type name" << endl; - throw generation_failed (); + throw operation_failed (); } // Fall through. @@ -600,7 +600,7 @@ namespace relational << ": error: string literal expected in MySQL ENUM " << "or SET declaration" << endl; - throw generation_failed (); + throw operation_failed (); } if (r.type == sql_type::ENUM) @@ -616,7 +616,7 @@ namespace relational << ": error: comma expected in MySQL ENUM or " << "SET declaration" << endl; - throw generation_failed (); + throw operation_failed (); } t = l.next (); @@ -630,7 +630,7 @@ namespace relational << ": error: integer range expected in MySQL type " << "declaration" << endl; - throw generation_failed (); + throw operation_failed (); } unsigned int v; @@ -642,7 +642,7 @@ namespace relational << ": error: invalid range value '" << t.literal () << "'in MySQL type declaration" << endl; - throw generation_failed (); + throw operation_failed (); } r.range = true; @@ -673,7 +673,7 @@ namespace relational << ": error: expected ')' in MySQL type declaration" << endl; - throw generation_failed (); + throw operation_failed (); } s = parse_sign; @@ -730,7 +730,7 @@ namespace relational cerr << m.file () << ":" << m.line () << ":" << m.column () << ": error: incomplete MySQL type declaration" << endl; - throw generation_failed (); + throw operation_failed (); } // If range is omitted for CHAR or BIT types, it defaults to 1. @@ -749,7 +749,7 @@ namespace relational << ": error: invalid MySQL type declaration: " << e.message << endl; - throw generation_failed (); + throw operation_failed (); } } } diff --git a/odb/relational/mysql/schema.cxx b/odb/relational/mysql/schema.cxx index 4a7171f..8b31563 100644 --- a/odb/relational/mysql/schema.cxx +++ b/odb/relational/mysql/schema.cxx @@ -89,7 +89,7 @@ namespace relational << "enumerator must map to MySQL ENUM or integer type" << endl; - throw generation_failed (); + throw operation_failed (); } } @@ -124,7 +124,7 @@ namespace relational << ": error: unable to map C++ enumerator '" << name << "' to MySQL ENUM value" << endl; - throw generation_failed (); + throw operation_failed (); } } else diff --git a/odb/relational/pgsql/context.cxx b/odb/relational/pgsql/context.cxx index 68739df..b058696 100644 --- a/odb/relational/pgsql/context.cxx +++ b/odb/relational/pgsql/context.cxx @@ -370,7 +370,7 @@ namespace relational << ": error: PostgreSQL time zones are not currently " << "supported" << endl; - throw generation_failed (); + throw operation_failed (); } else if (id == "TIMESTAMP") { @@ -382,7 +382,7 @@ namespace relational << ": error: PostgreSQL time zones are not currently " << "supported" << endl; - throw generation_failed (); + throw operation_failed (); } // // String and binary types. @@ -457,7 +457,7 @@ namespace relational else cerr << " error: expected PostgreSQL type name" << endl; - throw generation_failed (); + throw operation_failed (); } // Fall through. @@ -476,7 +476,7 @@ namespace relational << ": error: integer range expected in PostgreSQL type " << "declaration" << endl; - throw generation_failed (); + throw operation_failed (); } unsigned int v; @@ -488,7 +488,7 @@ namespace relational << ": error: invalid range value '" << t.literal () << "'in PostgreSQL type declaration" << endl; - throw generation_failed (); + throw operation_failed (); } r.range = true; @@ -510,7 +510,7 @@ namespace relational << ": error: expected ')' in PostgreSQL type " << "declaration" << endl; - throw generation_failed (); + throw operation_failed (); } s = parse_suffix; @@ -551,7 +551,7 @@ namespace relational << m.column ()<< ": error: PostgreSQL time " << "zones are not currently supported" << endl; - throw generation_failed (); + throw operation_failed (); } } } @@ -597,7 +597,7 @@ namespace relational cerr << m.file () << ":" << m.line () << ":" << m.column () << ": error: incomplete PostgreSQL type declaration" << endl; - throw generation_failed (); + throw operation_failed (); } // If range is omitted for CHAR or BIT types, it defaults to 1. @@ -616,7 +616,7 @@ namespace relational << ": error: invalid PostgreSQL type declaration: " << e.message << endl; - throw generation_failed (); + throw operation_failed (); } } } diff --git a/odb/relational/pgsql/schema.cxx b/odb/relational/pgsql/schema.cxx index 098d6e9..70d4979 100644 --- a/odb/relational/pgsql/schema.cxx +++ b/odb/relational/pgsql/schema.cxx @@ -67,7 +67,7 @@ namespace relational << ": error: automatically assigned object id must map " << "to PostgreSQL INTEGER or BIGINT" << endl; - throw generation_failed (); + throw operation_failed (); } } else @@ -99,7 +99,7 @@ namespace relational << ": error: column with default value specified as C++ " << "enumerator must map to PostgreSQL integer type" << endl; - throw generation_failed (); + throw operation_failed (); } } diff --git a/odb/relational/processor.cxx b/odb/relational/processor.cxx index cc3c695..82852f0 100644 --- a/odb/relational/processor.cxx +++ b/odb/relational/processor.cxx @@ -53,7 +53,7 @@ namespace relational os << unit.file () << ": error: unable to resolve odb namespace" << endl; - throw generation_failed (); + throw operation_failed (); } // Find wrapper traits. @@ -67,7 +67,7 @@ namespace relational os << unit.file () << ": error: unable to resolve wrapper_traits " << "in the odb namespace" << endl; - throw generation_failed (); + throw operation_failed (); } // Find pointer traits. @@ -81,7 +81,7 @@ namespace relational os << unit.file () << ": error: unable to resolve pointer_traits " << "in the odb namespace" << endl; - throw generation_failed (); + throw operation_failed (); } // Find the access class. @@ -94,7 +94,7 @@ namespace relational os << unit.file () << ": error: unable to resolve access class" << "in the odb namespace" << endl; - throw generation_failed (); + throw operation_failed (); } access = TREE_TYPE (access); @@ -110,7 +110,7 @@ namespace relational os << unit.file () << ": error: unable to resolve container_traits " << "in the odb namespace" << endl; - throw generation_failed (); + throw operation_failed (); } } @@ -216,7 +216,7 @@ namespace relational << " info: use '#pragma db type' to specify the database type" << endl; - throw generation_failed (); + throw operation_failed (); } void @@ -308,7 +308,7 @@ namespace relational << " info: use '#pragma db " << prefix << "_type' to specify the " << "database type" << endl; - throw generation_failed (); + throw operation_failed (); } bool @@ -371,7 +371,7 @@ namespace relational inst, get_identifier ("kind"), false, false)); if (kind == error_mark_node || TREE_CODE (kind) != VAR_DECL) - throw generation_failed (); + throw operation_failed (); // Instantiate this decalaration so that we can get its value. @@ -384,7 +384,7 @@ namespace relational tree init (DECL_INITIAL (kind)); if (init == error_mark_node || TREE_CODE (init) != INTEGER_CST) - throw generation_failed (); + throw operation_failed (); unsigned long long e; @@ -401,7 +401,7 @@ namespace relational ck = static_cast (e); } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "container_traits specialization does not define the " @@ -425,7 +425,7 @@ namespace relational inst, get_identifier ("value_type"), true, false)); if (decl == error_mark_node || TREE_CODE (decl) != TYPE_DECL) - throw generation_failed (); + throw operation_failed (); tree type (TYPE_MAIN_VARIANT (TREE_TYPE (decl))); vt = &dynamic_cast (*unit.find (type)); @@ -442,7 +442,7 @@ namespace relational decl = TYPE_NAME (ot); } } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "container_traits specialization does not define the " @@ -465,7 +465,7 @@ namespace relational os << t.file () << ":" << t.line () << ":" << t.column () << ":" << " error: set container cannot contain null values" << endl; - throw generation_failed (); + throw operation_failed (); } else t.set ("value-not-null", true); @@ -492,7 +492,7 @@ namespace relational inst, get_identifier ("index_type"), true, false)); if (decl == error_mark_node || TREE_CODE (decl) != TYPE_DECL) - throw generation_failed (); + throw operation_failed (); tree type (TYPE_MAIN_VARIANT (TREE_TYPE (decl))); it = &dynamic_cast (*unit.find (type)); @@ -509,7 +509,7 @@ namespace relational decl = TYPE_NAME (ot); } } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "container_traits specialization does not define the " @@ -534,7 +534,7 @@ namespace relational inst, get_identifier ("key_type"), true, false)); if (decl == error_mark_node || TREE_CODE (decl) != TYPE_DECL) - throw generation_failed (); + throw operation_failed (); tree type (TYPE_MAIN_VARIANT (TREE_TYPE (decl))); kt = &dynamic_cast (*unit.find (type)); @@ -551,7 +551,7 @@ namespace relational decl = TYPE_NAME (ot); } } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "container_traits specialization does not define the " @@ -595,7 +595,7 @@ namespace relational os << m.file () << ":" << m.line () << ":" << m.column () << ":" << " error: set container cannot contain null values" << endl; - throw generation_failed (); + throw operation_failed (); } // Issue a warning if we are relaxing null-ness in the member. @@ -652,7 +652,7 @@ namespace relational inst, get_identifier ("element_type"), true, false)); if (decl == error_mark_node || TREE_CODE (decl) != TYPE_DECL) - throw generation_failed (); + throw operation_failed (); tn = TYPE_MAIN_VARIANT (TREE_TYPE (decl)); @@ -691,7 +691,7 @@ namespace relational || n.compare (0, 19, "::boost::shared_ptr") == 0; } } - catch (generation_failed const&) + catch (operation_failed const&) { os << fl << ":" << ln << ":" << cl << ": error: pointer_traits " << "specialization does not define the 'element_type' type" @@ -715,7 +715,7 @@ namespace relational inst, get_identifier ("kind"), false, false)); if (kind == error_mark_node || TREE_CODE (kind) != VAR_DECL) - throw generation_failed (); + throw operation_failed (); // Instantiate this decalaration so that we can get its value. // @@ -727,7 +727,7 @@ namespace relational tree init (DECL_INITIAL (kind)); if (init == error_mark_node || TREE_CODE (init) != INTEGER_CST) - throw generation_failed (); + throw operation_failed (); unsigned long long e; @@ -745,7 +745,7 @@ namespace relational pointer_kind_type pk = static_cast (e); t.set ("pointer-kind", pk); } - catch (generation_failed const&) + catch (operation_failed const&) { os << fl << ":" << ln << ":" << cl << ": error: pointer_traits " << "specialization does not define the 'kind' constant" << endl; @@ -761,7 +761,7 @@ namespace relational inst, get_identifier ("lazy"), false, false)); if (lazy == error_mark_node || TREE_CODE (lazy) != VAR_DECL) - throw generation_failed (); + throw operation_failed (); // Instantiate this decalaration so that we can get its value. // @@ -773,7 +773,7 @@ namespace relational tree init (DECL_INITIAL (lazy)); if (init == error_mark_node || TREE_CODE (init) != INTEGER_CST) - throw generation_failed (); + throw operation_failed (); unsigned long long e; @@ -790,7 +790,7 @@ namespace relational t.set ("pointer-lazy", static_cast (e)); } - catch (generation_failed const&) + catch (operation_failed const&) { os << fl << ":" << ln << ":" << cl << ": error: pointer_traits " << "specialization does not define the 'kind' constant" << endl; @@ -813,7 +813,7 @@ namespace relational << "info: consider including its definition with the " << "--odb-prologue option" << endl; - throw generation_failed (); + throw operation_failed (); } // Make sure the pointed-to class is not abstract. @@ -827,7 +827,7 @@ namespace relational os << c->file () << ":" << c->line () << ":" << c->column () << ": " << "info: class '" << c->name () << "' is defined here" << endl; - throw generation_failed (); + throw operation_failed (); } // See if this is the inverse side of a bidirectional relationship. @@ -846,7 +846,7 @@ namespace relational << "error: unable to resolve data member '" << name << "' " << "specified with '#pragma db inverse' in class '" << c->fq_name () << "'" << endl; - throw generation_failed (); + throw operation_failed (); } data_member* im (dynamic_cast (unit.find (decl))); @@ -857,7 +857,7 @@ namespace relational << "ice: unable to find semantic graph node corresponding to " << "data member '" << name << "' in class '" << c->fq_name () << "'" << endl; - throw generation_failed (); + throw operation_failed (); } // @@ Would be good to check that the other end is actually @@ -904,7 +904,7 @@ namespace relational inst, get_identifier ("wrapped_type"), true, false)); if (decl == error_mark_node || TREE_CODE (decl) != TYPE_DECL) - throw generation_failed (); + throw operation_failed (); tree type (TYPE_MAIN_VARIANT (TREE_TYPE (decl))); semantics::type& wt ( @@ -927,7 +927,7 @@ namespace relational t.set ("wrapper-type", &wt); t.set ("wrapper-hint", wh); } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "wrapper_traits specialization does not define the " @@ -947,7 +947,7 @@ namespace relational inst, get_identifier ("null_handler"), false, false)); if (nh == error_mark_node || TREE_CODE (nh) != VAR_DECL) - throw generation_failed (); + throw operation_failed (); // Instantiate this decalaration so that we can get its value. // @@ -959,7 +959,7 @@ namespace relational tree init (DECL_INITIAL (nh)); if (init == error_mark_node || TREE_CODE (init) != INTEGER_CST) - throw generation_failed (); + throw operation_failed (); unsigned long long e; @@ -977,7 +977,7 @@ namespace relational null_handler = static_cast (e); t.set ("wrapper-null-handler", null_handler); } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "wrapper_traits specialization does not define the " @@ -997,7 +997,7 @@ namespace relational inst, get_identifier ("null_default"), false, false)); if (nh == error_mark_node || TREE_CODE (nh) != VAR_DECL) - throw generation_failed (); + throw operation_failed (); // Instantiate this decalaration so that we can get its value. // @@ -1009,7 +1009,7 @@ namespace relational tree init (DECL_INITIAL (nh)); if (init == error_mark_node || TREE_CODE (init) != INTEGER_CST) - throw generation_failed (); + throw operation_failed (); unsigned long long e; @@ -1026,7 +1026,7 @@ namespace relational t.set ("wrapper-null-default", static_cast (e)); } - catch (generation_failed const&) + catch (operation_failed const&) { os << f << ":" << l << ":" << c << ": error: " << "wrapper_traits specialization does not define the " @@ -1056,7 +1056,7 @@ namespace relational { // Diagnostics has already been issued by lookup_template_class. // - throw generation_failed (); + throw operation_failed (); } inst = TYPE_MAIN_VARIANT (inst); @@ -1178,7 +1178,7 @@ namespace relational error (i->loc) << "member name expected after an alias in db pragma " << "column" << endl; - throw generation_failed (); + throw operation_failed (); } tt = lex_.next (t); @@ -1212,7 +1212,7 @@ namespace relational << "name '" << name << "' in db pragma column does not " << "refer to a data member of a persistent class that " << "is used in this view" << endl; - throw generation_failed (); + throw operation_failed (); } obj = j->second->object; @@ -1225,7 +1225,7 @@ namespace relational { error (i->loc) << "name '" << name << "' in db pragma column " << "does not refer to a data member" << endl; - throw generation_failed (); + throw operation_failed (); } data_member* m (dynamic_cast (unit.find (decl))); @@ -1246,7 +1246,7 @@ namespace relational { error (i->loc) << "name '" << t << "' in db pragma column " << "does not refer to a data member" << endl; - throw generation_failed (); + throw operation_failed (); } m = dynamic_cast (unit.find (decl)); @@ -1262,13 +1262,13 @@ namespace relational catch (lookup::invalid_name const&) { error (i->loc) << "invalid name in db pragma column" << endl; - throw generation_failed (); + throw operation_failed (); } catch (lookup::unable_to_resolve const& e) { error (i->loc) << "unable to resolve name '" << e.name () << "' in db pragma column" << endl; - throw generation_failed (); + throw operation_failed (); } } @@ -1326,7 +1326,7 @@ namespace relational << "use db pragma column to specify the corresponding data " << "member or column name" << endl; - throw generation_failed (); + throw operation_failed (); } else if (members.size () > 1) { @@ -1349,7 +1349,7 @@ namespace relational info (m.file (), m.line (), m.column ()) << "use db pragma column to resolve this ambiguity" << endl; - throw generation_failed (); + throw operation_failed (); } // Synthesize the column expression for this member. @@ -1627,7 +1627,7 @@ namespace relational << "with the view" << endl; - throw generation_failed (); + throw operation_failed (); } // Resolve referenced objects from tree nodes to semantic graph @@ -1652,7 +1652,7 @@ namespace relational << "name '" << i->orig_name << "' in db pragma object does " << "not name a class" << endl; - throw generation_failed (); + throw operation_failed (); } class_& o (dynamic_cast (*unit.find (n))); @@ -1666,7 +1666,7 @@ namespace relational info (o.file (), o.line (), o.column ()) << "class '" << i->orig_name << "' is defined here" << endl; - throw generation_failed (); + throw operation_failed (); } i->object = &o; @@ -1683,7 +1683,7 @@ namespace relational << "use the alias clause to assign it a different name" << endl; - throw generation_failed (); + throw operation_failed (); } } else @@ -1695,7 +1695,7 @@ namespace relational << "alias '" << i->alias << "' is used in the view more " << "than once" << endl; - throw generation_failed (); + throw operation_failed (); } } @@ -1749,7 +1749,7 @@ namespace relational << "use the join condition clause in db pragma object " << "to specify a custom join condition" << endl; - throw generation_failed (); + throw operation_failed (); } else if (rs.size () > 1) { @@ -1777,7 +1777,7 @@ namespace relational << "use the join condition clause in db pragma object " << "to resolve this ambiguity" << endl; - throw generation_failed (); + throw operation_failed (); } // Synthesize the condition. @@ -1962,7 +1962,7 @@ namespace relational << "name '" << p << "' specified with db pragma pointer " << "does not name a type or a template" << endl; - throw generation_failed (); + throw operation_failed (); } } @@ -2027,7 +2027,7 @@ namespace relational << "--default-pointer option does not name a class " << "template" << endl; - throw generation_failed (); + throw operation_failed (); } string n (decl_as_string (decl, TFF_PLAIN_IDENTIFIER)); @@ -2125,7 +2125,7 @@ namespace relational } catch (cxx_lexer::invalid_input const&) { - throw generation_failed (); + throw operation_failed (); } c.set ("object-pointer", ptr); @@ -2142,7 +2142,7 @@ namespace relational << "--default-pointer option is invalid" << endl; - throw generation_failed (); + throw operation_failed (); } catch (unable_to_resolve const& ex) { @@ -2155,7 +2155,7 @@ namespace relational << "unable to resolve name '" << ex.name () << "' specified " << "with the --default-pointer option" << endl; - throw generation_failed (); + throw operation_failed (); } } diff --git a/odb/relational/processor.hxx b/odb/relational/processor.hxx index 6ef2913..bb91dbd 100644 --- a/odb/relational/processor.hxx +++ b/odb/relational/processor.hxx @@ -8,7 +8,7 @@ namespace relational { - // Issues diagnostics and throws generation_failed in case of an error. + // Issues diagnostics and throws operation_failed in case of an error. // void process (); diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx index 4f8ecfc..ac29e6d 100644 --- a/odb/relational/source.cxx +++ b/odb/relational/source.cxx @@ -131,7 +131,7 @@ namespace relational error (loc) << "member name expected after an alias in db pragma " << prag << endl; - throw generation_failed (); + throw operation_failed (); } ptt = tt; @@ -185,7 +185,7 @@ namespace relational error (loc) << "name '" << name << "' in db pragma " << prag << " " << "does not refer to a data member" << endl; - throw generation_failed (); + throw operation_failed (); } else return expression ( @@ -227,7 +227,7 @@ namespace relational { error (loc) << "name expected after '.' in db pragma " << prag << endl; - throw generation_failed (); + throw operation_failed (); } tree type (TYPE_MAIN_VARIANT (TREE_TYPE (decl))); @@ -240,7 +240,7 @@ namespace relational error (loc) << "name '" << t << "' in db pragma " << prag << " does not " << "refer to a data member" << endl; - throw generation_failed (); + throw operation_failed (); } m = dynamic_cast (ctx.unit.find (decl)); @@ -285,7 +285,7 @@ namespace relational if (fail) { error (loc) << "invalid name in db pragma " << prag << endl; - throw generation_failed (); + throw operation_failed (); } else return expression ( @@ -297,7 +297,7 @@ namespace relational { error (loc) << "unable to resolve name '" << e.name () << "' in db pragma " << prag << endl; - throw generation_failed (); + throw operation_failed (); } else return expression ( diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index cd89081..c59af8f 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -207,7 +207,7 @@ namespace relational << ": error: column expression specified for a data member " << "of a composite value type" << endl; - throw generation_failed (); + throw operation_failed (); } data_member_path const& mp (e.back ().member_path); @@ -218,7 +218,7 @@ namespace relational << ": error: invalid data member in db pragma column" << endl; - throw generation_failed (); + throw operation_failed (); } table_prefix_ = e.back ().table; @@ -234,7 +234,7 @@ namespace relational << ": info: use db pragma column to specify the column prefix" << endl; - throw generation_failed (); + throw operation_failed (); } in_composite_ = true; @@ -324,7 +324,7 @@ namespace relational << ": info: use db pragma column to specify the column name" << endl; - throw generation_failed (); + throw operation_failed (); } column (m, col); @@ -3289,7 +3289,7 @@ namespace relational << "use the full join condition clause in db pragma " << "object to resolve this ambiguity" << endl; - throw generation_failed (); + throw operation_failed (); } if (vo == 0) @@ -3299,7 +3299,7 @@ namespace relational << "specified in the join condition has not been " << "previously associated with this view" << endl; - throw generation_failed (); + throw operation_failed (); } } diff --git a/odb/relational/sqlite/context.cxx b/odb/relational/sqlite/context.cxx index f10e904..a135947 100644 --- a/odb/relational/sqlite/context.cxx +++ b/odb/relational/sqlite/context.cxx @@ -225,7 +225,7 @@ namespace relational { } - // Issues diagnostics and throws generation_failed in case of + // Issues diagnostics and throws operation_failed in case of // an error. // sql_type @@ -270,7 +270,7 @@ namespace relational cerr << m_.file () << ":" << m_.line () << ":" << m_.column () << ": error: expected SQLite type name instead of '" << t << "'" << endl; - throw generation_failed (); + throw operation_failed (); } } } @@ -279,14 +279,14 @@ namespace relational cerr << m_.file () << ":" << m_.line () << ":" << m_.column () << ": error: invalid SQLite type declaration: " << e.message << endl; - throw generation_failed (); + throw operation_failed (); } if (ids_.empty ()) { cerr << m_.file () << ":" << m_.line () << ":" << m_.column () << ": error: expected SQLite type name" << endl; - throw generation_failed (); + throw operation_failed (); } sql_type r; @@ -322,7 +322,7 @@ namespace relational { cerr << m_.file () << ":" << m_.line () << ":" << m_.column () << " error: unknown SQLite type '" << id << "'" << endl; - throw generation_failed (); + throw operation_failed (); } } @@ -344,7 +344,7 @@ namespace relational cerr << m_.file () << ":" << m_.line () << ":" << m_.column () << ": error: missing ')' in SQLite type declaration" << endl; - throw generation_failed (); + throw operation_failed (); } } } diff --git a/odb/relational/sqlite/schema.cxx b/odb/relational/sqlite/schema.cxx index 77a9590..1ed835e 100644 --- a/odb/relational/sqlite/schema.cxx +++ b/odb/relational/sqlite/schema.cxx @@ -35,7 +35,7 @@ namespace relational << ": error: column with default value specified as C++ " << "enumerator must map to SQLite INTEGER" << endl; - throw generation_failed (); + throw operation_failed (); } using semantics::enumerator; -- cgit v1.1