Unverified Commit a58d1b3b authored by 743294668's avatar 743294668 Committed by GitHub
Browse files

Modify OracleDB connection string format. (#2970) 



Co-authored-by: default avatartaoyuxin <taoyuxin@inspur.com>
parent 3a7fd725

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java

+1 −0
Original line number Diff line number Diff line
@@ -514,6 +514,7 @@ public class DataSourceService extends BaseService{ 
        }



        Map<String, Object> parameterMap = new LinkedHashMap<String, Object>(6);

        parameterMap.put(TYPE, connectType);

        parameterMap.put(Constants.ADDRESS, address);

        parameterMap.put(Constants.DATABASE, database);

        parameterMap.put(Constants.JDBC_URL, jdbcUrl);

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.api.service; 
import org.apache.dolphinscheduler.api.ApiApplicationServer;

import org.apache.dolphinscheduler.api.enums.Status;

import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.common.enums.DbConnectType;

import org.apache.dolphinscheduler.common.enums.DbType;

import org.apache.dolphinscheduler.common.enums.UserType;

import org.apache.dolphinscheduler.dao.entity.User;
@@ -50,4 +51,12 @@ public class DataSourceServiceTest { 
        Map<String, Object> map = dataSourceService.queryDataSourceList(loginUser, DbType.MYSQL.ordinal());

        Assert.assertEquals(Status.SUCCESS, map.get(Constants.STATUS));

    }



    @Test

    public void buildParameter(){

        String param = dataSourceService.buildParameter("","", DbType.ORACLE, "192.168.9.1","1521","im"

                ,"","test","test", DbConnectType.ORACLE_SERVICE_NAME,"");

        String expected = "{\"type\":\"ORACLE_SERVICE_NAME\",\"address\":\"jdbc:oracle:thin:@//192.168.9.1:1521\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:oracle:thin:@//192.168.9.1:1521/im\",\"user\":\"test\",\"password\":\"test\"}";

        Assert.assertEquals(expected, param);

    }

}
 
 No newline at end of file

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public abstract class BaseDataSource { 
   * append database

   * @param jdbcUrl jdbc url

   */

  private void appendDatabase(StringBuilder jdbcUrl) {

  protected void appendDatabase(StringBuilder jdbcUrl) {

    if (dbTypeSelector() == DbType.SQLSERVER) {

      jdbcUrl.append(";databaseName=").append(getDatabase());

    } else {

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java

+7 −9
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package org.apache.dolphinscheduler.dao.datasource; 
import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.common.enums.DbConnectType;

import org.apache.dolphinscheduler.common.enums.DbType;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



/**

 * data source of Oracle
@@ -46,16 +44,16 @@ public class OracleDataSource extends BaseDataSource { 
    }



    /**

     * gets the JDBC url for the data source connection

     * @return jdbc url

     * append service name or SID

     */

    @Override

    public String getJdbcUrl() {

        String jdbcUrl = getAddress();

        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {

            jdbcUrl += "/";

    protected void appendDatabase(StringBuilder jdbcUrl) {

        if (getType() == DbConnectType.ORACLE_SID) {

            jdbcUrl.append(":");

        } else {

            jdbcUrl.append("/");

        }

        return jdbcUrl;

        jdbcUrl.append(getDatabase());

    }



    /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSourceTest.java

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * 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.dolphinscheduler.dao.datasource;



import org.apache.dolphinscheduler.common.enums.DbConnectType;

import org.junit.Assert;

import org.junit.Test;



public class OracleDataSourceTest {



    @Test

    public void testGetOracleJdbcUrl() {

        OracleDataSource oracleDataSource = new OracleDataSource();

        oracleDataSource.setType(DbConnectType.ORACLE_SERVICE_NAME);

        oracleDataSource.setAddress("jdbc:oracle:thin:@//127.0.0.1:1521");

        oracleDataSource.setDatabase("test");

        oracleDataSource.setPassword("123456");

        oracleDataSource.setUser("test");

        Assert.assertEquals("jdbc:oracle:thin:@//127.0.0.1:1521/test", oracleDataSource.getJdbcUrl());

        //set fake principal

        oracleDataSource.setPrincipal("fake principal");

        Assert.assertEquals("jdbc:oracle:thin:@//127.0.0.1:1521/test", oracleDataSource.getJdbcUrl());

        //set fake other

        oracleDataSource.setOther("charset=UTF-8");

        Assert.assertEquals("jdbc:oracle:thin:@//127.0.0.1:1521/test?charset=UTF-8", oracleDataSource.getJdbcUrl());



        OracleDataSource oracleDataSource2 = new OracleDataSource();

        oracleDataSource2.setAddress("jdbc:oracle:thin:@127.0.0.1:1521");

        oracleDataSource2.setDatabase("orcl");

        oracleDataSource2.setPassword("123456");

        oracleDataSource2.setUser("test");

        oracleDataSource2.setType(DbConnectType.ORACLE_SID);

        Assert.assertEquals("jdbc:oracle:thin:@127.0.0.1:1521:orcl", oracleDataSource2.getJdbcUrl());

        //set fake principal

        oracleDataSource2.setPrincipal("fake principal");

        Assert.assertEquals("jdbc:oracle:thin:@127.0.0.1:1521:orcl", oracleDataSource2.getJdbcUrl());

        //set fake other

        oracleDataSource2.setOther("charset=UTF-8");

        Assert.assertEquals("jdbc:oracle:thin:@127.0.0.1:1521:orcl?charset=UTF-8", oracleDataSource2.getJdbcUrl());

    }



    @Test

    public void testAppendDatabase() {

        OracleDataSource oracleDataSource = new OracleDataSource();

        oracleDataSource.setAddress("jdbc:oracle:thin:@//127.0.0.1:1521");

        oracleDataSource.setDatabase("test");

        oracleDataSource.setType(DbConnectType.ORACLE_SERVICE_NAME);

        StringBuilder jdbcUrl = new StringBuilder(oracleDataSource.getAddress());

        oracleDataSource.appendDatabase(jdbcUrl);

        Assert.assertEquals("jdbc:oracle:thin:@//127.0.0.1:1521/test", jdbcUrl.toString());



        OracleDataSource oracleDataSource2 = new OracleDataSource();

        oracleDataSource2.setAddress("jdbc:oracle:thin:@127.0.0.1:1521");

        oracleDataSource2.setDatabase("orcl");

        oracleDataSource2.setType(DbConnectType.ORACLE_SID);

        StringBuilder jdbcUrl2 = new StringBuilder(oracleDataSource2.getAddress());

        oracleDataSource2.appendDatabase(jdbcUrl2);

        Assert.assertEquals("jdbc:oracle:thin:@127.0.0.1:1521:orcl", jdbcUrl2.toString());

    }

} 
 No newline at end of file