Author: aadamchik
Date: Sun Nov 11 11:59:55 2012
New Revision: 1407952
URL: http://svn.apache.org/viewvc?rev=1407952&view=rev
Log:
CAY-1769 cdbimport improvements: meaningfulPk flag must be turned into a pattern
docs
release notes
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1407952&r1=1407951&r2=1407952&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sun Nov 11
11:59:55 2012
@@ -33,6 +33,7 @@ CAY-1764 cdbimport improvements: "overwr
CAY-1765 cdbimport improvements: add excludeTables/includeTables parameters
CAY-1766 Deprecating DataPort ant task
CAY-1768 cdbimport improvements: DataMap "project-version" attribute is
skipped when DM is saved
+CAY-1769 cdbimport improvements: meaningfulPk flag must be turned into a
pattern
Bug Fixes:
Modified:
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml?rev=1407952&r1=1407951&r2=1407952&view=diff
==============================================================================
---
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
(original)
+++
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
Sun Nov 11 11:59:55 2012
@@ -447,22 +447,21 @@
<tr>
<td><code>excludeTables</code></td>
<td>boolean</td>
- <td>A comma separated
list of Perl5 patterns that defines which table
- names should be
skipped during the import. This (together with
-
'includeTables') is the most flexible way to filter the table list.
- Another way to
filter it is via "tablePattern" that is limited to
- filtering with
a single wildcard pattern as defined in
-
DatabaseMetadata.getTables().</td>
+ <td>A comma-separated
list of Perl5 patterns that defines which table names should be skipped
+ during the
import. This (together with 'includeTables') is the most
+ flexible way to
filter the table list. Another way to filter it is
+ via
"tablePattern" that is limited to filtering with a single
+ wildcard
pattern as defined in DatabaseMetadata.getTables().</td>
</tr>
<tr>
<td><code>includeTables</code></td>
<td>boolean</td>
- <td>A comma separated
list of Perl5 patterns that defines which table
- names should be
included during the import. Additionally matching
- tables will be
compared with "excludeTables" pattern. If they match
- include and
exclude, they will be skipped. Another way to filter it
- is via
"tablePattern" that is limited to filtering with a single
- wildcard
pattern as defined in DatabaseMetadata.getTables().</td>
+ <td>A comma-separated
list of Perl5 patterns that defines which table names should be
+ included during
the import. Additionally matching tables will be
+ compared with
"excludeTables" pattern. If they match include and
+ exclude, they
will be skipped. Another way to filter it is via
+ "tablePattern"
that is limited to filtering with a single wildcard
+ pattern as
defined in DatabaseMetadata.getTables().</td>
</tr>
<tr>
<td><code>importProcedures</code></td>
@@ -471,10 +470,11 @@
database.
Default is false. </td>
</tr>
<tr>
-
<td><code>meaningfulPk</code></td>
- <td>boolean</td>
- <td>Indicates whether
primary keys should be mapped as attributes of the
- ObjEntity.
Default is false. </td>
+
<td><code>meaningfulPkTables</code></td>
+ <td>String</td>
+ <td>A comma-separated
list of Perl5 patterns that defines which imported tables should have
+ their primary
key columns mapped as ObjAttributes. "*" would
+ indicate all
tables.</td>
</tr>
<tr>
<td><code>namingStrategy</code></td>
