From 1d98f0160da68be27dcb46ae653e6cc4692a5bbe Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
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/relational/mysql/context.cxx | 16 ++++++++--------
 odb/relational/mysql/schema.cxx  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'odb/relational/mysql')

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
-- 
cgit v1.1