From a950cdbc1a8f787cbeade7bf42d88313d53dd9d5 Mon Sep 17 00:00:00 2001 From: Mars Lan Date: Wed, 28 Jun 2017 16:23:18 -0700 Subject: [PATCH] Fix the bug where MySQL credential isn't properly passed to DatabaseWriter. (#585) --- .../main/java/wherehows/common/writers/DatabaseWriter.java | 4 ++-- .../java/metadata/etl/lineage/AzLineageExtractorMaster.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wherehows-common/src/main/java/wherehows/common/writers/DatabaseWriter.java b/wherehows-common/src/main/java/wherehows/common/writers/DatabaseWriter.java index dfdfe58d28..75320e132b 100644 --- a/wherehows-common/src/main/java/wherehows/common/writers/DatabaseWriter.java +++ b/wherehows-common/src/main/java/wherehows/common/writers/DatabaseWriter.java @@ -44,9 +44,9 @@ public class DatabaseWriter extends Writer { this.tableName = tableName; } - public DatabaseWriter(String connectionUrl, String tableName) + public DatabaseWriter(String connectionUrl, String username, String password, String tableName) throws SQLException { - DriverManagerDataSource dataSource = new DriverManagerDataSource(connectionUrl); + DriverManagerDataSource dataSource = new DriverManagerDataSource(connectionUrl, username, password); this.jdbcTemplate = new JdbcTemplate(dataSource); this.tableName = tableName; } diff --git a/wherehows-etl/src/main/java/metadata/etl/lineage/AzLineageExtractorMaster.java b/wherehows-etl/src/main/java/metadata/etl/lineage/AzLineageExtractorMaster.java index 1c042a3843..f5fc94b63e 100644 --- a/wherehows-etl/src/main/java/metadata/etl/lineage/AzLineageExtractorMaster.java +++ b/wherehows-etl/src/main/java/metadata/etl/lineage/AzLineageExtractorMaster.java @@ -95,7 +95,7 @@ public class AzLineageExtractorMaster { String wherehowsUserName = prop.getProperty(Constant.WH_DB_USERNAME_KEY); String wherehowsPassWord = prop.getProperty(Constant.WH_DB_PASSWORD_KEY); Connection conn = DriverManager.getConnection(wherehowsUrl, wherehowsUserName, wherehowsPassWord); - DatabaseWriter databaseWriter = new DatabaseWriter(conn.getMetaData().getURL(), "stg_job_execution_data_lineage"); + DatabaseWriter databaseWriter = new DatabaseWriter(wherehowsUrl, wherehowsUserName, wherehowsPassWord, "stg_job_execution_data_lineage"); AzLogParser.initialize(conn); PathAnalyzer.initialize(conn);