Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expect user name to be null (SPR-7228)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-05-21 15:59:00 +00:00
parent 66aca1e8b3
commit ed3cb4217d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/DerbyCallMetaDataProvider.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import java.sql.SQLException;
* This class is intended for internal use by the Simple JDBC classes.
*
* @author Thomas Risberg
* @author Juergen Hoeller
* @since 2.5
*/
public class DerbyCallMetaDataProvider extends GenericCallMetaDataProvider {
@@ -32,11 +33,14 @@ public class DerbyCallMetaDataProvider extends GenericCallMetaDataProvider {
super(databaseMetaData);
}
@Override
public String metaDataSchemaNameToUse(String schemaName) {
// Use current user schema if no schema specified
return schemaName == null ? getUserName().toUpperCase() : super.metaDataSchemaNameToUse(schemaName);
if (schemaName != null) {
return super.metaDataSchemaNameToUse(schemaName);
}
// Use current user schema if no schema specified...
String userName = getUserName();
return (userName != null ? userName.toUpperCase() : null);
}
}