aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-01-27 12:39:57 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-01-27 12:39:57 +0200
commit691b0f1ec76329c5ef0796a310f66c30c879f317 (patch)
tree00d378ca3d3c19272de45ba8377e55e77a06d2b3
parentef7dd01920a4a28ba3c4aad3abe69bd43beee9fa (diff)
Rename --default-schema to --schema
-rw-r--r--NEWS3
-rw-r--r--odb/context.cxx4
-rw-r--r--odb/options.cli2
3 files changed, 4 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 8f1e6b6..70d9742 100644
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,7 @@ 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.
+ * The --default-schema option has been renamed to --schema-name.
* Default Oracle mapping for std::string has changed from VARCHAR2(4000)
to VARCHAR2(512).
diff --git a/odb/context.cxx b/odb/context.cxx
index 48d42c7..928068d 100644
--- a/odb/context.cxx
+++ b/odb/context.cxx
@@ -597,9 +597,9 @@ schema (semantics::scope& s) const
// If we are still not fully qualified, add the schema that was
// specified on the command line.
//
- if (!r.fully_qualified () && options.default_schema_specified ())
+ if (!r.fully_qualified () && options.schema_specified ())
{
- qname n (options.default_schema ());
+ qname n (options.schema ());
n.append (r);
n.swap (r);
}
diff --git a/odb/options.cli b/odb/options.cli
index 61cc92e..18bd232 100644
--- a/odb/options.cli
+++ b/odb/options.cli
@@ -143,7 +143,7 @@ class options
profile."
};
- qname --default-schema
+ qname --schema
{
"<schema>",
"Place database objects (tables, indexes, etc) into <schema>."