Merge remote-tracking branch 'remotes/open/master' into merges/os-mere-2018-10-31

# Conflicts:
#	README.md
#	docs/source/api-persistence.rst
#	docs/source/node-database.rst
This commit is contained in:
szymonsztuka
2018-10-31 18:08:59 +00:00
26 changed files with 612 additions and 287 deletions

View File

@ -113,7 +113,7 @@ Several examples of entities and mappings are provided in the codebase, includin
:language: kotlin
.. note:: Ensure table and column names are compatible with the naming convention of database vendors for which the Cordapp will be deployed,
e.g. prior to Oracle 12.2 the maximum length of table/column name is 30 bytes (the exact number of characters depends on the database encoding).
e.g. for Oracle database, prior to version 12.2 the maximum length of table/column name is 30 bytes (the exact number of characters depends on the database encoding).
Identity mapping
----------------