Fix Hibernate tests to work with sqlproxy

Author: rafiss

go.mod

@@ -3,7 +3,7 @@ module github.com/cockroachdb/examples-orms
 go 1.13
 
 require (
-	github.com/cockroachdb/cockroach-go/v2 v2.2.2
+	github.com/cockroachdb/cockroach-go/v2 v2.2.3
 	github.com/go-pg/pg/v10 v10.9.0
 	github.com/julienschmidt/httprouter v1.1.0
 	github.com/lib/pq v1.10.0

go.sum

@@ -4,8 +4,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/cockroach-go/v2 v2.2.2 h1:Xe6azwMWPr/HywnspK+REnDHVsod4WMwhgkAeIRC5Tk=
-github.com/cockroachdb/cockroach-go/v2 v2.2.2/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI=
+github.com/cockroachdb/cockroach-go/v2 v2.2.3 h1:2881elKwTMrAWuSP2N/4PtU6XyqoyI55Fv3TSTD+Efo=
+github.com/cockroachdb/cockroach-go/v2 v2.2.3/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=

java/hibernate/build.gradle

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     // Necessary for Hibernate.
-    implementation 'org.hibernate:hibernate-core:5.4.30.Final'
+    implementation 'org.hibernate:hibernate-core:5.5.8.Final'
     implementation 'org.postgresql:postgresql:42.2.19'
 
     // Necessary for web application.

java/hibernate/src/main/java/com/cockroachlabs/util/SessionUtil.java

@@ -36,22 +36,26 @@ private SessionUtil(String dbAddr) {
         if (dbAddr != null) {
             // Most drivers expect the user in a connection to be specified like:
             //   postgresql://<user>@host:port/db
-            // but the PGJDBC expects the user as a parameter like:
-            //   postgresql://host:port/db?user=<user>
-            Pattern p = Pattern.compile("postgresql://((\\w+)@).*");
+            // but the PGJDBC driver expects the user as a parameter like:
+            //   postgresql://host:port/db
+            // with the username and password passed as separate properties.
+            Pattern p = Pattern.compile("postgresql://((\\w+)(:(\\w+))?@).*");
             Matcher m = p.matcher(dbAddr);
             if (m.matches()) {
                 String userPart = m.group(1);
                 String user = m.group(2);
+                String password = m.group(4);
 
-
-                String sep = "?";
-                if (dbAddr.contains("?")) {
-                    sep = "&";
+                dbAddr = dbAddr.replace(userPart, "");
+                configuration.setProperty("hibernate.connection.user", user);
+                if (password != null && !password.equals("")) {
+                    configuration.setProperty("hibernate.connection.password", password);
                 }
-                dbAddr = String.format("%s%suser=%s", dbAddr.replace(userPart, ""), sep, user);
             }
 
+            // The client cert must be in PKCS8 format for Java.
+            dbAddr = dbAddr.replace("client.root.key", "client.root.key.pk8");
+
             // Add the "jdbc:" prefix to the address and replace in configuration.
             dbAddr = "jdbc:" + dbAddr;
             configuration.setProperty("hibernate.connection.url", dbAddr);

java/hibernate/src/main/resources/hibernate.cfg.xml

@@ -16,7 +16,7 @@
         <property name="connection.pool_size">16</property>
 
         <!-- SQL dialect -->
-        <property name="dialect">org.hibernate.dialect.PostgreSQL94Dialect</property>
+        <property name="dialect">org.hibernate.dialect.CockroachDB201Dialect</property>
 
         <!-- Echo all executed SQL to stdout -->
         <property name="show_sql">true</property>

testing/main_test.go

@@ -435,26 +435,7 @@ func TestGOPG(t *testing.T) {
 }
 
 func TestHibernate(t *testing.T) {
-	testORMForAuthModesExcept(t,
-		testInfo{language: "java", orm: "hibernate"},
-		map[authMode]string{
-			// Driver does not unescape the path correctly:
-			// Caused by: java.io.FileNotFoundException:
-			//	%2Ftmp%2Fcockroach-testserver913095208%2Fcerts%2Fca.crt (No such file or directory)
-			//
-			// Furthermore, if we preprocess the query string via
-			//
-			//    tc.dbURL.RawQuery, err = url.QueryUnescape(tc.dbURL.RawQuery)
-			//
-			// then we run into
-			//   https://github.com/dbeaver/dbeaver/issues/1835
-			// because hibernate expects the key in DER format, but it is PEM.
-			//authClientCert: "needs DER format and unescaped query string",
-			// Doesn't seem to understand connection strings.
-			// Caused by: java.net.UnknownHostException: root:hunter2@localhost
-			//authPassword: "needs custom setup for password support",
-		},
-	)
+	testORMForAuthModesExcept(t, testInfo{language: "java", orm: "hibernate"}, nothingSkipped())
 }
 
 func TestSequelize(t *testing.T) {