diff --git a/reference/en/modules/basic_mapping.xml b/reference/en/modules/basic_mapping.xml
index b96b5729a2..8a20fab737 100644
--- a/reference/en/modules/basic_mapping.xml
+++ b/reference/en/modules/basic_mapping.xml
@@ -225,7 +225,7 @@
-
+
-
+
id
@@ -682,6 +682,15 @@
+ select
+
+
+ retrieves a primary key assigned by a database trigger by selecting
+ the row by some unique key and retrieving the primary key value.
+
+
+
+
foreign
@@ -696,7 +705,7 @@
- Hi/Lo Algorithm
+ Hi/lo algorithm
The hilo and seqhilo generators provide two alternate
implementations of the hi/lo algorithm, a favorite approach to identifier generation. The
@@ -729,7 +738,7 @@
- UUID Algorithm
+ UUID algorithm
The UUID contains: IP address, startup time of the JVM (accurate to a quarter
second), system time and a counter value (unique within the JVM). It's not
@@ -739,7 +748,7 @@
- Identity columns and Sequences
+ Identity columns and sequences
For databases which support identity columns (DB2, MySQL, Sybase, MS SQL), you
may use identity key generation. For databases that support
@@ -748,13 +757,13 @@
two SQL queries to insert a new object.
-
+
- uid_sequence
+ person_id_sequence
]]>
-
+
]]>
@@ -767,13 +776,13 @@
- Assigned Identifiers
+ Assigned identifiers
If you want the application to assign identifiers (as opposed to having
Hibernate generate them), you may use the assigned generator.
This special generator will use the identifier value already assigned to the
- object's identifier property. Be very careful when using this feature to assign
- keys with business meaning (almost always a terrible design decision).
+ object's identifier property. This generator is used when the primary key
+ is a natural key instead of a surrogate key.
@@ -785,6 +794,27 @@
+
+ Primary keys assigned by triggers
+
+ For legacy schemas only (Hibernate does not generate DDL with triggers).
+
+
+
+
+ socialSecurityNumber
+
+]]>
+
+
+ In the above example, there is a unique valued property named
+ socialSecurityNumber defined by the class, as a
+ natural key, and a surrogate key named person_id
+ whose value is generated by a trigger.
+
+
+
+