Mercurial > dive4elements > river
annotate artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java @ 9672:b70b1bc0eece 3.2.x
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Sat, 23 May 2020 10:37:23 +0200 |
parents | 9cfc495a9f40 |
children | 0a5239a1e46e |
rev | line source |
---|---|
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
1 /* Copyright (C) 2011, 2012, 2013, 2020 by Bundesanstalt für Gewässerkunde |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
2 * Software engineering by Intevation GmbH |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
3 * |
5994
af13ceeba52a
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5865
diff
changeset
|
4 * This file is Free Software under the GNU AGPL (>=v3) |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
5 * and comes with ABSOLUTELY NO WARRANTY! Check out the |
5994
af13ceeba52a
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5865
diff
changeset
|
6 * documentation coming with Dive4Elements River for details. |
5863
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
7 */ |
4897a58c8746
River artifacts: Added new copyright headers.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
8 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5422
diff
changeset
|
9 package org.dive4elements.river.utils; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
10 |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
11 import java.net.URI; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
12 import java.net.URISyntaxException; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
13 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
14 import org.apache.log4j.Logger; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
15 import org.hibernate.impl.SessionFactoryImpl; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
16 |
5831
bd047b71ab37
Repaired internal references
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5422
diff
changeset
|
17 import org.dive4elements.river.backend.SessionFactoryProvider; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
18 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
19 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
20 public class MapUtils |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
21 { |
8202
e4606eae8ea5
sed src/**/*.java 's/logger/log/g'
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5994
diff
changeset
|
22 private static final Logger log = Logger.getLogger(MapUtils.class); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
23 |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
24 private static final String JDBC_SCHEME = "^jdbc:"; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
25 |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
26 private static final String JDBC_DRV_PATTERN = |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
27 JDBC_SCHEME + "(postgresql|oracle:(thin|oci)):.*"; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
28 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
29 /** |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
30 * This method returns a connection string for databases used by |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
31 * Mapserver's Mapfile. |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
32 * |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
33 * @return A connection string for Mapserver. |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
34 */ |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
35 public static String getConnection() { |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
36 SessionFactoryImpl sf = (SessionFactoryImpl) |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
37 SessionFactoryProvider.getSessionFactory(); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
38 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
39 String user = SessionFactoryProvider.getUser(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
40 String pass = SessionFactoryProvider.getPass(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
41 String url = SessionFactoryProvider.getURL(sf); |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
42 |
9671
9cfc495a9f40
Add minimal test coverage for MapServer connection generation
Tom Gottfried <tom@intevation.de>
parents:
9670
diff
changeset
|
43 return getConnection(user, pass, url); |
9cfc495a9f40
Add minimal test coverage for MapServer connection generation
Tom Gottfried <tom@intevation.de>
parents:
9670
diff
changeset
|
44 } |
9cfc495a9f40
Add minimal test coverage for MapServer connection generation
Tom Gottfried <tom@intevation.de>
parents:
9670
diff
changeset
|
45 |
9cfc495a9f40
Add minimal test coverage for MapServer connection generation
Tom Gottfried <tom@intevation.de>
parents:
9670
diff
changeset
|
46 public static String getConnection(String user, String pass, String url) { |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
47 log.info("Parse connection string: " + url); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
48 |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
49 if (!url.matches(JDBC_DRV_PATTERN)) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
50 log.error("Could not parse connection string: " |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
51 + "Not a JDBC URL with PostgreSQL or Oracle driver"); |
9670 | 52 return null; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
53 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
54 |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
55 URI uri = null; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
56 try { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
57 // Strip JDBC_SCHEME to let the driver be parsed as scheme |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
58 uri = new URI(url.replaceFirst(JDBC_SCHEME, "")); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
59 } |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
60 catch (URISyntaxException e) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
61 log.error("Could not parse connection string: " + e.getMessage()); |
9670 | 62 return null; |
63 } | |
64 | |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
65 String drv = uri.getScheme(); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
66 log.debug("Driver: " + drv); |
9670 | 67 |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
68 String connection = null; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
69 if (drv.equals("oracle")) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
70 try { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
71 // Work-around the extra colon in the driver part of the scheme |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
72 String con = new URI(uri.getSchemeSpecificPart()) |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
73 .getSchemeSpecificPart().replaceFirst("^@(//)?", ""); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
74 log.debug("Database specifier: " + con); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
75 connection = user + "/" + pass + "@" + con; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
76 } |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
77 catch (URISyntaxException e) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
78 log.error("Could not parse Oracle connection string: " |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
79 + e.getMessage()); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
80 return null; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
81 } |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
82 } |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
83 else { // assume PostgreSQL |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
84 String host = uri.getHost(); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
85 if (host == null && uri.getSchemeSpecificPart().startsWith("//")) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
86 // invalid hostnames (e.g. containing '_') are not parsed! |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
87 log.error("Could not parse PostgreSQL connection string: " |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
88 + "invalid host name"); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
89 return null; |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
90 } |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
91 String db = host == null |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
92 ? uri.getSchemeSpecificPart() |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
93 : uri.getPath(); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
94 int port = uri.getPort(); |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
95 connection = createConnectionString(user, pass, host, db, port); |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
96 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
97 |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
98 return connection; |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
99 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
100 |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
101 private static String createConnectionString( |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
102 String user, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
103 String pass, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
104 String host, |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
105 String db, |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
106 int port |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
107 ) { |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
108 StringBuilder sb = new StringBuilder(); |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
109 // Required parameters |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
110 // defaults to user name in PostgreSQL JDBC: |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
111 if (db != null) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
112 db = db.replaceFirst("/", ""); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
113 } |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
114 sb.append("dbname=").append(db == null || db.equals("") ? user : db); |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
115 sb.append(" user=").append(user); |
9672
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
116 |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
117 // Optional parameters |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
118 if (host != null) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
119 sb.append(" host='").append(host).append("'"); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
120 } |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
121 if (port != -1) { |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
122 sb.append(" port=").append(port); |
b70b1bc0eece
Essentially rewrite MapUtils.getConnection() to cope with driver capabilities
Tom Gottfried <tom@intevation.de>
parents:
9671
diff
changeset
|
123 } |
5147
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
124 // XXX: We need to escape this somehow. |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
125 sb.append(" password='").append(pass).append("'"); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
126 sb.append(" sslmode=disable"); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
127 return sb.toString(); |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
128 } |
48b231a02d3a
Generate valid DB connection strings.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
4841
diff
changeset
|
129 |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
130 public static String getConnectionType() { |
5865
73da40528cf2
River artifacts: Renamed FLYSUtils to RiverUtils.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5863
diff
changeset
|
131 return RiverUtils.isUsingOracle() ? "oraclespatial" : "postgis"; |
4841
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
132 } |
ad0990a82ab8
Insert db connection into riveraxis map files.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff
changeset
|
133 } |