From c1d2ec5bbd5969332f3278f39d2a7a8f0abc0493 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 25 Jan 2012 14:58:24 +0200
Subject: Rename --default-schema to --schema-name

---
 NEWS                      |  3 +++
 doc/manual.xhtml          |  2 +-
 odb/options.cli           | 10 +++++-----
 odb/relational/source.hxx |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index c913eb6..8f1e6b6 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ Version 1.8.0
     Value Types" in the ODB manual as well as the 'composite' example in the
     odb-examples package.
 
+  * The --default-schema option has been renamed to --schema-name. The
+    --default-schema option is now used to specify the database schema.
+
   * Default Oracle mapping for std::string has changed from VARCHAR2(4000)
     to VARCHAR2(512).
 
diff --git a/doc/manual.xhtml b/doc/manual.xhtml
index 3b4ea40..064b8c9 100644
--- a/doc/manual.xhtml
+++ b/doc/manual.xhtml
@@ -2412,7 +2412,7 @@ namespace odb
      compiler generates all embedded schemas with the default schema
      name (empty string). However, if your application needs to
      have several separate schemas, you can use the
-     <code>--default-schema</code> ODB compiler option to assign
+     <code>--schema-name</code> ODB compiler option to assign
      custom schema names and then use these names as a second argument
      to <code>create_schema()</code>. If the schema is not found,
      <code>create_schema()</code> throws the
diff --git a/odb/options.cli b/odb/options.cli
index a8f6eeb..c92e4aa 100644
--- a/odb/options.cli
+++ b/odb/options.cli
@@ -84,13 +84,13 @@ class options
      formats."
   };
 
-  std::string --default-schema = ""
+  std::string --schema-name = ""
   {
     "<name>",
-    "Use <name> as the default database schema name. Schema names are
-     primarily used for distinguishing between multiple embedded schemas in
-     the schema catalog. If this option is not specified, the empty name,
-     which corresponds to the default schema, is used."
+    "Use <name> as the database schema name. Schema names are primarily
+     used for distinguishing between multiple embedded schemas in the
+     schema catalog. If this option is not specified, the empty name,
+     which is the default schema name, is used."
   };
 
   std::string --default-pointer = "*"
diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx
index 9860a30..d909f7b 100644
--- a/odb/relational/source.hxx
+++ b/odb/relational/source.hxx
@@ -3626,7 +3626,7 @@ namespace relational
 
         os << "static const schema_catalog_entry" << endl
            << "schema_catalog_entry_" << flat_name (type) << "_ (" << endl
-           << strlit (options.default_schema ()) << "," << endl
+           << strlit (options.schema_name ()) << "," << endl
            << "&" << traits << "::create_schema);"
            << endl;
       }
-- 
cgit v1.1