Browse Source

Merge pull request #5720 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x

* commit 'ea44a8d03536fcfaa6c43bc1485c17af3530a5e9':
  REPORT-78047 fix:greenplum连接url自动拼写添加DatabaseName=
feature/x
superman 2 years ago
parent
commit
5a62169c99
  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) { if (greenplumUrl) {
return { return {
host: greenplumUrl[4], host: greenplumUrl[4],

2
src/modules/constants/constant.ts

@ -537,7 +537,7 @@ export const DATA_BASE_TYPES = [
kerberos: false, kerberos: false,
urls: { urls: {
'org.postgresql.Driver': 'jdbc:postgresql://hostname:port/dbname', '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', text: 'Postgresql',

Loading…
Cancel
Save