mirror of https://github.com/apache/openjpa.git
OPENJPA-1975: Move default schema name code to its own method.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1090025 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick
parent
2d232cf4c0
commit
985a59afbd
|
|
@ -34,6 +34,8 @@ import java.util.Arrays;
|
|||
import java.util.Date;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import org.apache.openjpa.jdbc.identifier.DBIdentifier;
|
||||
import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
|
||||
import org.apache.openjpa.jdbc.kernel.JDBCStore;
|
||||
|
|
@ -268,26 +270,6 @@ public class DB2Dictionary
|
|||
super.connectedConfiguration(conn);
|
||||
|
||||
DatabaseMetaData metaData = conn.getMetaData();
|
||||
Statement stmnt = null;
|
||||
ResultSet rs =null;
|
||||
try {
|
||||
String str = "SELECT CURRENT SCHEMA FROM " + SYSDUMMY;
|
||||
stmnt = conn.createStatement();
|
||||
rs = stmnt.executeQuery(str);
|
||||
if (rs.next()) {
|
||||
String currSchema = rs.getString(1);
|
||||
if (currSchema != null)
|
||||
setDefaultSchemaName(currSchema.trim());
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
if (log.isTraceEnabled())
|
||||
log.trace(_loc.get("can_not_get_current_schema", e.getMessage()));
|
||||
} finally {
|
||||
if (rs != null)
|
||||
rs.close();
|
||||
if (stmnt != null)
|
||||
stmnt.close();
|
||||
}
|
||||
|
||||
String driverName = metaData.getDriverName();
|
||||
if (driverName != null && driverName.startsWith("IBM DB2"))
|
||||
|
|
@ -1115,4 +1097,79 @@ public class DB2Dictionary
|
|||
public int getDB2MinorVersion() {
|
||||
return min;
|
||||
}
|
||||
|
||||
public String getDefaultSchemaName() {
|
||||
if (defaultSchemaName == null) {
|
||||
Connection conn = null;
|
||||
Statement stmnt = null;
|
||||
ResultSet rs = null;
|
||||
try {
|
||||
String str = "SELECT CURRENT SCHEMA FROM " + SYSDUMMY;
|
||||
conn = getConnection();
|
||||
stmnt = conn.createStatement();
|
||||
rs = stmnt.executeQuery(str);
|
||||
if (rs.next()) {
|
||||
String currSchema = rs.getString(1);
|
||||
if (currSchema != null) {
|
||||
setDefaultSchemaName(currSchema.trim());
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
if (log.isTraceEnabled()) {
|
||||
log.trace(_loc.get("can_not_get_current_schema", e.getMessage()));
|
||||
}
|
||||
} finally {
|
||||
if (rs != null) {
|
||||
try {
|
||||
rs.close();
|
||||
} catch (SQLException se) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
if (stmnt != null) {
|
||||
try {
|
||||
stmnt.close();
|
||||
} catch (SQLException se) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (conn != null) {
|
||||
try {
|
||||
conn.close();
|
||||
}
|
||||
catch(SQLException se) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return defaultSchemaName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtain a connection from the configuration. Tries to use the jta-data-source first but falls back on the
|
||||
* non-jta-data-source if no jta-data-source has been defined.
|
||||
*
|
||||
* In practice this method is only called by getDefaultSchemaName which in turn is only used by the schema tool.
|
||||
*
|
||||
* @throws SQLException If neither datasource is available.
|
||||
* @return A connection which may be used to obtain the default schema name. Callers do not need to check for null.
|
||||
*/
|
||||
private Connection getConnection() throws SQLException {
|
||||
// try to obtain a connection from the primary datasource
|
||||
DataSource ds = conf.getDataSource(null);
|
||||
|
||||
if(ds == null) {
|
||||
// use datasource 2 if available
|
||||
ds = conf.getDataSource2(null);
|
||||
}
|
||||
|
||||
if (ds != null) {
|
||||
return ds.getConnection();
|
||||
}
|
||||
|
||||
// throw
|
||||
throw new SQLException("Unable to obtain a datasource");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ public class DBDictionary
|
|||
public String nameConcatenator = "_";
|
||||
public String delimitedCase = SCHEMA_CASE_PRESERVE;
|
||||
public String catalogSeparator = ".";
|
||||
private String defaultSchemaName = null;
|
||||
protected String defaultSchemaName = null;
|
||||
private String conversionKey = null;
|
||||
|
||||
// Naming utility and naming rules
|
||||
|
|
|
|||
|
|
@ -0,0 +1,206 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.openjpa.jdbc.sql;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
|
||||
import org.apache.openjpa.kernel.StoreContext;
|
||||
import org.jmock.Expectations;
|
||||
import org.jmock.integration.junit3.MockObjectTestCase;
|
||||
|
||||
public class TestDB2Dictionary extends MockObjectTestCase {
|
||||
final JDBCConfiguration mockConfiguration = mock(JDBCConfiguration.class);
|
||||
final Statement mockStatement = mock(Statement.class);
|
||||
final Connection mockConnection = mock(Connection.class);
|
||||
final ResultSet mockRS = mock(ResultSet.class);
|
||||
final DataSource mockDS = mock(DataSource.class);
|
||||
|
||||
final StoreContext sc = null;
|
||||
final String schema = "abcd";
|
||||
|
||||
/*
|
||||
* When DS1 is non null we should get a connection and use it to obtain the schema name.
|
||||
*/
|
||||
public void testGetDefaultSchemaNameDS1() throws Exception {
|
||||
// Expected method calls on the mock objects above. If any of these are
|
||||
// do not occur, or if any other methods are invoked on the mock objects
|
||||
// an exception will be thrown and the test will fail.
|
||||
checking(new Expectations() {
|
||||
{
|
||||
// Wiring, make sure the appropriate mocks are created.
|
||||
oneOf(mockConfiguration).getDataSource(with(equal(sc)));
|
||||
will(returnValue(mockDS));
|
||||
|
||||
oneOf(mockDS).getConnection();
|
||||
will(returnValue(mockConnection));
|
||||
|
||||
oneOf(mockConnection).createStatement();
|
||||
will(returnValue(mockStatement));
|
||||
|
||||
oneOf(mockStatement).executeQuery(with(any(String.class)));
|
||||
will(returnValue(mockRS));
|
||||
|
||||
// expect one call to rs.next() - needs to return true.
|
||||
oneOf(mockRS).next();
|
||||
will(returnValue(true));
|
||||
|
||||
// return our schema name
|
||||
oneOf(mockRS).getString(1);
|
||||
will(returnValue(schema));
|
||||
|
||||
// cleanup
|
||||
oneOf(mockConnection).close();
|
||||
oneOf(mockRS).close();
|
||||
oneOf(mockStatement).close();
|
||||
|
||||
allowing(mockConfiguration);
|
||||
}
|
||||
});
|
||||
|
||||
DBDictionary dict = new DB2Dictionary();
|
||||
dict.setConfiguration(mockConfiguration);
|
||||
assertNotNull(dict);
|
||||
assertEquals(schema, dict.getDefaultSchemaName());
|
||||
}
|
||||
|
||||
/*
|
||||
* When ds1 is null, fallback to ds2
|
||||
*/
|
||||
public void testGetDefaultSchemaNameDS2() throws Exception {
|
||||
// Expected method calls on the mock objects above. If any of these are
|
||||
// do not occur, or if any other methods are invoked on the mock objects
|
||||
// an exception will be thrown and the test will fail.
|
||||
checking(new Expectations() {
|
||||
{
|
||||
// Wiring, make sure the appropriate mocks are created.
|
||||
oneOf(mockConfiguration).getDataSource(with(equal(sc)));
|
||||
will(returnValue(null));
|
||||
|
||||
oneOf(mockConfiguration).getDataSource2(with(equal(sc)));
|
||||
will(returnValue(mockDS));
|
||||
|
||||
oneOf(mockDS).getConnection();
|
||||
will(returnValue(mockConnection));
|
||||
|
||||
oneOf(mockConnection).createStatement();
|
||||
will(returnValue(mockStatement));
|
||||
|
||||
oneOf(mockStatement).executeQuery(with(any(String.class)));
|
||||
will(returnValue(mockRS));
|
||||
|
||||
// expect one call to rs.next() - needs to return true.
|
||||
oneOf(mockRS).next();
|
||||
will(returnValue(true));
|
||||
|
||||
// return our schema name
|
||||
oneOf(mockRS).getString(1);
|
||||
will(returnValue(schema));
|
||||
|
||||
// cleanup
|
||||
oneOf(mockConnection).close();
|
||||
oneOf(mockRS).close();
|
||||
oneOf(mockStatement).close();
|
||||
|
||||
allowing(mockConfiguration);
|
||||
}
|
||||
});
|
||||
|
||||
DBDictionary dict = new DB2Dictionary();
|
||||
dict.setConfiguration(mockConfiguration);
|
||||
assertNotNull(dict);
|
||||
assertEquals(schema, dict.getDefaultSchemaName());
|
||||
}
|
||||
|
||||
/*
|
||||
* When ds1 is null, fallback to ds2
|
||||
*/
|
||||
public void testGetDefaultSchemaNameNoDS() throws Exception {
|
||||
// Expected method calls on the mock objects above. If any of these are
|
||||
// do not occur, or if any other methods are invoked on the mock objects
|
||||
// an exception will be thrown and the test will fail.
|
||||
checking(new Expectations() {
|
||||
{
|
||||
// both datasources are null for this test.
|
||||
oneOf(mockConfiguration).getDataSource(with(equal(sc)));
|
||||
will(returnValue(null));
|
||||
|
||||
oneOf(mockConfiguration).getDataSource2(with(equal(sc)));
|
||||
will(returnValue(null));
|
||||
|
||||
allowing(mockConfiguration);
|
||||
}
|
||||
});
|
||||
|
||||
DBDictionary dict = new DB2Dictionary();
|
||||
dict.setConfiguration(mockConfiguration);
|
||||
assertNotNull(dict);
|
||||
assertEquals(null, dict.getDefaultSchemaName());
|
||||
}
|
||||
|
||||
/*
|
||||
* TestWhitespace trim
|
||||
*/
|
||||
public void testGetDefaultSchemaNameTrimmed() throws Exception {
|
||||
final String schema2 = "abcd ";
|
||||
// Expected method calls on the mock objects above. If any of these are
|
||||
// do not occur, or if any other methods are invoked on the mock objects
|
||||
// an exception will be thrown and the test will fail.
|
||||
checking(new Expectations() {
|
||||
{
|
||||
// Wiring, make sure the appropriate mocks are created.
|
||||
oneOf(mockConfiguration).getDataSource(with(equal(sc)));
|
||||
will(returnValue(mockDS));
|
||||
|
||||
oneOf(mockDS).getConnection();
|
||||
will(returnValue(mockConnection));
|
||||
|
||||
oneOf(mockConnection).createStatement();
|
||||
will(returnValue(mockStatement));
|
||||
|
||||
oneOf(mockStatement).executeQuery(with(any(String.class)));
|
||||
will(returnValue(mockRS));
|
||||
|
||||
// expect one call to rs.next() - needs to return true.
|
||||
oneOf(mockRS).next();
|
||||
will(returnValue(true));
|
||||
|
||||
// return our schema name
|
||||
oneOf(mockRS).getString(1);
|
||||
will(returnValue(schema2));
|
||||
|
||||
// cleanup
|
||||
oneOf(mockConnection).close();
|
||||
oneOf(mockRS).close();
|
||||
oneOf(mockStatement).close();
|
||||
|
||||
allowing(mockConfiguration);
|
||||
}
|
||||
});
|
||||
|
||||
DBDictionary dict = new DB2Dictionary();
|
||||
dict.setConfiguration(mockConfiguration);
|
||||
assertNotNull(dict);
|
||||
assertEquals(schema2.trim(), dict.getDefaultSchemaName());
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue