From 5d8f5cc0e6d658ae1f74bdf977988bbe995701bb Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 21 Jul 2011 11:01:33 +0200 Subject: Change section order --- NEWS | 2 +- doc/manual.xhtml | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index f277964..500e2d0 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ Version 1.5.0 container's element values, the value_null and value_not_null pragmas have been added, similar to the value_type, value_column, etc., pragmas. For more information about the new mechanism, refer to Sections 10.2.3, - 10.2.8, 10.3.6, and 10.3.13 in the ODB manual. + 10.2.8, 10.3.4, and 10.3.13 in the ODB manual. This is a backwards-incompatible change. Existing use cases that will require manual changes are listed below. diff --git a/doc/manual.xhtml b/doc/manual.xhtml index 39b4c35..bb505e2 100644 --- a/doc/manual.xhtml +++ b/doc/manual.xhtml @@ -442,9 +442,9 @@ for consistency. 10.3.1id 10.3.2auto 10.3.3type - 10.3.4column - 10.3.5transient - 10.3.6null/not_null + 10.3.4null/not_null + 10.3.5column + 10.3.6transient 10.3.7inverse 10.3.8unordered 10.3.9table @@ -3885,8 +3885,8 @@ class employee

By default, an object pointer can be NULL. To specify that a pointer always points to a valid object we can - use the not_null pragma (Section - 10.3.6, "null/not_null") for + use the not_null pragma (Section + 10.3.4, "null/not_null") for single object pointers and the value_not_null pragma (Section 10.3.13, "value_null/value_not_null") @@ -4972,8 +4972,8 @@ t.commit ();

Customizing a column name for a data member of a simple value type is straightforward: we simply specify the desired name with - the db column pragma (Section - 10.3.4, "column"). For composite value + the db column pragma (Section + 10.3.5, "column"). For composite value types things are slightly more complex since they are mapped to multiple columns. Consider the following example:

@@ -6229,7 +6229,7 @@ typedef shared_ptr<person> person_ptr;

The NULL semantics can also be specified on the - per-member basis (Section 10.3.6, + per-member basis (Section 10.3.4, "null/not_null"). If both a type and a member have null/not_null specifiers, then the member specifier takes precedence. If a member specifier @@ -6445,20 +6445,20 @@ typedef std::map<unsigned short, float> age_weight_map; - column - column name for member + null/not_null + member can/cannot be NULL 10.3.4 - transient - member is not stored in the database + column + column name for member 10.3.5 - null/not_null - member can/cannot be NULL + transient + member is not stored in the database 10.3.6 @@ -6604,11 +6604,11 @@ class person }; -

The null and not_null (Section - 10.3.6, "null/not_null") specifiers +

The null and not_null (Section + 10.3.4, "null/not_null") specifiers can be used to control the NULL semantics of a data member.

-

10.3.4 column

+

10.3.5 column

The column specifier specifies the column name that should be used to store a data member in a relational database. @@ -6633,7 +6633,7 @@ class person name by removing the common data member name decorations, such as leading and trailing underscores, the m_ prefix, etc.

-

10.3.5 transient

+

10.3.6 transient

The transient specifier instructs the ODB compiler not to store a data member in the database. For example:

@@ -6655,7 +6655,7 @@ class person references that are only meaningful in the application's memory, as well as utility members such as mutexes, etc.

-

10.3.6 null/not_null

+

10.3.4 null/not_null

The null and not_null specifiers specify that a data member can or cannot be NULL, respectively. @@ -6876,7 +6876,7 @@ class person cannot be NULL, respectively. The semantics of value_null and value_not_null are similar to that of the null and not_null specifiers - (Section 10.3.6, "null/not_null"). + (Section 10.3.4, "null/not_null"). For example:

@@ -6909,7 +6909,7 @@ class account
      container's table for a data member. The semantics of
      id_column are similar to that of the
      column specifier
-     (Section 10.3.4, "column").
+     (Section 10.3.5, "column").
      For example:

 
   
@@ -6933,7 +6933,7 @@ class person
      ordered container's table for a data member. The semantics of
      index_column are similar to that of the
      column specifier
-     (Section 10.3.4, "column").
+     (Section 10.3.5, "column").
      For example:

 
   
@@ -6957,7 +6957,7 @@ class person
      container's table for a data member. The semantics of
      key_column are similar to that of the
      column specifier
-     (Section 10.3.4, "column").
+     (Section 10.3.5, "column").
      For example:

 
   
@@ -6981,7 +6981,7 @@ class person
      container's table for a data member. The semantics of
      value_column are similar to that of the
      column specifier
-     (Section 10.3.4, "column").
+     (Section 10.3.5, "column").
      For example:

 
   
-- 
cgit v1.1