Skip to content

[BugFix] Fix MySQL getPrimaryKeys database name error (#5235) #5471

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

Open
zhang-arvin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BugFix] Fix MySQL getPrimaryKeys database name error (#5235) #5471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...vice/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public List<MetaColumnInfo> getColumns(String database, String table)
ResultSet rs = null;
ResultSetMetaData meta = null;
try {
List<String> primaryKeys = getPrimaryKeys(getDBConnection(connectMessage, database), table);
List<String> primaryKeys = getPrimaryKeys(getDBConnection(connectMessage, database), database, table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
Expand All @@ -156,16 +156,17 @@ public List<MetaColumnInfo> getColumns(String database, String table)
* Get primary keys
*
* @param connection connection
* @param database database name
* @param table table name
* @return
* @throws SQLException
*/
private List<String> getPrimaryKeys(Connection connection, String table) throws SQLException {
private List<String> getPrimaryKeys(Connection connection, String database, String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
DatabaseMetaData dbMeta = connection.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
rs = dbMeta.getPrimaryKeys(database, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
}
Expand Down
10 changes: 7 additions & 3 deletions ...ce/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public abstract class AbstractSqlConnection implements Closeable {

public ConnectMessage connectMessage;

protected String database;

public AbstractSqlConnection(
String host,
Integer port,
Expand All @@ -45,6 +47,7 @@ public AbstractSqlConnection(
String database,
Map<String, Object> extraParams)
throws ClassNotFoundException, SQLException {
this.database = database;
connectMessage = new ConnectMessage(host, port, username, password, extraParams);
conn = getDBConnection(connectMessage, database);
// Try to create statement
Expand All @@ -63,7 +66,7 @@ public List<MetaColumnInfo> getColumns(String schemaname, String table)
ResultSet rs = null;
ResultSetMetaData meta;
try {
List<String> primaryKeys = getPrimaryKeys(table);
List<String> primaryKeys = getPrimaryKeys(database, table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
Expand All @@ -87,16 +90,17 @@ public List<MetaColumnInfo> getColumns(String schemaname, String table)
/**
* Get primary keys // * @param connection connection
*
* @param database database name
* @param table table name
* @return
* @throws SQLException
*/
public List<String> getPrimaryKeys(String table) throws SQLException {
public List<String> getPrimaryKeys(String database, String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
rs = dbMeta.getPrimaryKeys(database, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
}
Expand Down
7 changes: 4 additions & 3 deletions ...vice/jdbc/src/main/java/org/apache/linkis/metadata/query/service/mysql/SqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public List<MetaColumnInfo> getColumns(String database, String table)
ResultSet rs = null;
ResultSetMetaData meta = null;
try {
List<String> primaryKeys = getPrimaryKeys(table);
List<String> primaryKeys = getPrimaryKeys(database, table);
ps = conn.prepareStatement(columnSql);
rs = ps.executeQuery();
meta = rs.getMetaData();
Expand All @@ -136,16 +136,17 @@ public List<MetaColumnInfo> getColumns(String database, String table)
/**
* Get primary keys
*
* @param database database name
* @param table table name
* @return
* @throws SQLException
*/
private List<String> getPrimaryKeys(String table) throws SQLException {
private List<String> getPrimaryKeys(String database, String table) throws SQLException {
ResultSet rs = null;
List<String> primaryKeys = new ArrayList<>();
try {
DatabaseMetaData dbMeta = conn.getMetaData();
rs = dbMeta.getPrimaryKeys(null, null, table);
rs = dbMeta.getPrimaryKeys(database, null, table);
while (rs.next()) {
primaryKeys.add(rs.getString("column_name"));
}
Expand Down