Author: dgeraskov
Date: 2008-11-11 06:06:14 -0500 (Tue, 11 Nov 2008)
New Revision: 11659
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2740
dialect option added.
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2008-11-11
11:06:07 UTC (rev 11658)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2008-11-11
11:06:14 UTC (rev 11659)
@@ -123,6 +123,10 @@
if(StringHelper.isNotEmpty( prefs.getNamingStrategy())) {
overrides.put( "hibernate.ejb.naming_strategy", prefs.getNamingStrategy()
); //$NON-NLS-1$
}
+
+ if(StringHelper.isNotEmpty( prefs.getDialectName())) {
+ overrides.put( "hibernate.dialect", prefs.getDialectName() );
//$NON-NLS-1$
+ }
if(!includeMappings) {
overrides.put( "hibernate.archive.autodetection", "none" );
//$NON-NLS-1$//$NON-NLS-2$
@@ -571,9 +575,14 @@
throw new
HibernateConsoleRuntimeException(ConsoleMessages.ConsoleConfiguration_could_not_configure_naming_strategy
+ prefs.getNamingStrategy(), c);
}
}
-
+
localCfg = loadConfigurationXML( localCfg, includeMappings, entityResolver );
localCfg = configureConnectionProfile(localCfg);
+
+ // replace dialect if it is set in preferences
+ if(StringHelper.isNotEmpty( prefs.getDialectName())) {
+ localCfg.setProperty("hibernate.dialect", prefs.getDialectName());
+ }
return localCfg;
}
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java 2008-11-11
11:06:07 UTC (rev 11658)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java 2008-11-11
11:06:14 UTC (rev 11659)
@@ -54,12 +54,13 @@
private String persistenceUnitName;
private String namingStrategy;
private String connectionProfile;
+ private String dialectName;
public AbstractConsoleConfigurationPreferences(String name, ConfigurationMode
configurationMode,
String projectName, boolean useProjectclassPath, String entityResolver,
String persistenceUnitName, String namingStrategy,
- String connectionProfile) {
+ String connectionProfile, String dialectName) {
setName(name);
this.persistenceUnitName = persistenceUnitName;
this.namingStrategy = namingStrategy;
@@ -68,6 +69,7 @@
this.projectName = projectName;
this.useProjectClasspath = useProjectclassPath;
this.connectionProfile = connectionProfile;
+ this.dialectName = dialectName;
}
protected AbstractConsoleConfigurationPreferences() {
@@ -89,6 +91,10 @@
public String getConnectionProfileName() {
return connectionProfile;
}
+
+ public String getDialectName() {
+ return dialectName;
+ }
public void setName(String name) {
if(name==null || name.trim().length()==0) {
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java 2008-11-11
11:06:07 UTC (rev 11658)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java 2008-11-11
11:06:14 UTC (rev 11659)
@@ -122,4 +122,6 @@
public abstract String getNamingStrategy();
public abstract String getConnectionProfileName();
+
+ public abstract String getDialectName();
}
\ No newline at end of file
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java 2008-11-11
11:06:07 UTC (rev 11658)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java 2008-11-11
11:06:14 UTC (rev 11659)
@@ -46,7 +46,7 @@
private File[] customClasspath;
public StandAloneConsoleConfigurationPreferences(String name, File xmlconfig, File
propertiesFile, File[] mappingFiles, File[] customClasspath) {
- super(name, ConfigurationMode.CORE, null, false, null, null, null, null);
+ super(name, ConfigurationMode.CORE, null, false, null, null, null, null, null);
this.cfgFile = xmlconfig;
this.propertyFilename = propertiesFile;
this.mappings = mappingFiles;