Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

winduprule-386 hibernate default props #358

Merged
merged 14 commits into from
Mar 7, 2019
Merged

winduprule-386 hibernate default props #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
384dbe7
winduprule-386 check hibernate.default_schema and hibernate.default_c…
Feb 25, 2019
532bdaa
winduprule-386 fixed the namespace used in the file
Feb 25, 2019
bb741dd
winduprule-386 simplified the rule using params
Feb 27, 2019
91dac3e
winduprule-386 redefined rule and added test files
Mar 7, 2019
3d17521
Merge branch 'master' into windup-386-hibernate-default-props
Mar 7, 2019
cb3c83a
winduprule-386 add 2 spaces, again
Mar 7, 2019
06dffb3
winduprule-386 add trailing spaces
Mar 7, 2019
1d7f18a
Update rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
mrizzi Mar 7, 2019
8874148
Update rules-reviewed/eap7/eap71/tests/hibernate51-53.windup.test.xml
mrizzi Mar 7, 2019
6249451
Update rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
mrizzi Mar 7, 2019
ac843b0
winduprule-386 applied suggestions from PR regarding text in messages
Mar 7, 2019
40f12f4
winduprule-386 fixed comment
Mar 7, 2019
379b458
Merge remote-tracking branch 'origin/windup-386-hibernate-default-pro…
Mar 7, 2019
f2ea584
Update rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
mrizzi Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 16 additions & 13 deletions rules-reviewed/eap7/eap71/hibernate51-53.windup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,25 +396,28 @@
<matches pattern="(persister|tuple)"/>
</where>
</rule>
<!--https://issues.jboss.org/browse/WINDUPRULE-385
<rule id="hibernate51-53-00900">
<when>
</when>
<perform>
</perform>
<where param="">
<matches pattern="" />
</where>
</rule>
-->
<!--https://issues.jboss.org/browse/WINDUPRULE-386
<!--https://issues.jboss.org/browse/WINDUPRULE-386-->
<rule id="hibernate51-53-01000">
<when>
<and>
<xmlfile matches="//s:persistence-unit" as="persistence_files">
<namespace prefix="s" uri="http://java.sun.com/xml/ns/persistence"/>
</xmlfile>
<xmlfile matches="//s:properties[count(s:property[@name='hibernate.default_schema'])=0 and count(s:property[@name='hibernate.default_catalog'])=0]" from="persistence_files" as="wrong_files">
<namespace prefix="s" uri="http://java.sun.com/xml/ns/persistence"/>
</xmlfile>
</and>
</when>
<perform>
<iteration over="wrong_files">
<hint title="Hibernate 5.3 - default_schema or default_catalog must be defined or set jdbc_metadata_extraction_strategy" category-id="mandatory" effort="1">
<message>Define `hibernate.default_schema` or `hibernate.default_catalog` (whichever is used by the selected dialect), or, alternatively, set `hibernate.hbm2ddl.jdbc_metadata_extraction_strategy=individually`.</message>
<link title="Red Hat JBoss EAP 7.2: Migrating from Hibernate ORM 5.1 to Hibernate ORM 5.3" href="https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#schema_management_tooling_changes_71"/>
<tag>hibernate</tag>
</hint>
</iteration>
</perform>
</rule>
-->
<!--https://issues.jboss.org/browse/WINDUPRULE-387-->
<rule id="hibernate51-53-01100">
<when>
Expand Down
15 changes: 15 additions & 0 deletions .../eap71/tests/data/data-hibernate51-53/Hibernate5153-01000-persistence-default-catalog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="testPU" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/testdb</jta-data-source>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.autocommit" value="true"/>
<property name="hibernate.default_catalog" value="mycatalog"/>
</properties>
</persistence-unit>
</persistence>
15 changes: 15 additions & 0 deletions ...7/eap71/tests/data/data-hibernate51-53/Hibernate5153-01000-persistence-default-schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="testPU" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/testdb</jta-data-source>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.autocommit" value="true"/>
<property name="hibernate.default_schema" value="myschema"/>
</properties>
</persistence-unit>
</persistence>
14 changes: 14 additions & 0 deletions ...iewed/eap7/eap71/tests/data/data-hibernate51-53/Hibernate5153-01000-persistence-empty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
<persistence-unit name="testPU" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/testdb</jta-data-source>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.connection.autocommit" value="true"/>
</properties>
</persistence-unit>
</persistence>
8 changes: 4 additions & 4 deletions rules-reviewed/eap7/eap71/tests/hibernate51-53.windup.test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,20 +235,20 @@
</perform>
</rule>
-->
<!--https://issues.jboss.org/browse/WINDUPRULE-386
<!--https://issues.jboss.org/browse/WINDUPRULE-386-->
<rule id="hibernate51-53-01000-test">
<when>
<not>
<iterable-filter size="1">
<hint-exists message="" />
<hint-exists message="Define `hibernate.default_schema` or `hibernate.default_catalog`"/>
</iterable-filter>
</not>
</when>
<perform>
<fail message="" />
<fail message="No default_schema or default_catalog found"/>
</perform>
</rule>
-->
<!--https://issues.jboss.org/browse/WINDUPRULE-387-->
<rule id="hibernate51-53-01100-test">
<when>
<not>
Expand Down