Browse Source

Merge pull request #5714 in DEC/decision-webui-dcm from release/10.0 to bugfix/10.0

* commit '3a18f06fbade7d52a559f29c9be4c3769ad2a7af':
  REPORT-78047 fix:greenplum连接url自动拼写添加DatabaseName=
bugfix/10.0
superman 2 years ago
parent
commit
13ba866422
  1. 2
      src/modules/app.provider.ts
  2. 2
      src/modules/constants/constant.ts

2
src/modules/app.provider.ts

@ -16,7 +16,7 @@ BI.provider('dec.connection.provider.datebase', function() {
};
}
const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;)([^]+)(.*)/i);
const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)(.*)/i);
if (greenplumUrl) {
return {
host: greenplumUrl[4],

2
src/modules/constants/constant.ts

@ -537,7 +537,7 @@ export const DATA_BASE_TYPES = [
kerberos: false,
urls: {
'org.postgresql.Driver': 'jdbc:postgresql://hostname:port/dbname',
'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;dbname',
'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;DatabaseName=dbname',
},
}, {
text: 'Postgresql',

Loading…
Cancel
Save