upd: final touches for upgrade to postgres

diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index 763af7cb628ee2b54e8e1ff109e2cb6baf319794..dd09c691bb2b57fb7b431d2b98288c285eec5232 100755 (executable)
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ "$JDBC_DRIVER" == "" ]
 then
-JDBC_DRIVER=/usr/share/java/mysql-connector-java.jar
+JDBC_DRIVER=/usr/share/java/postgresql-jdbc4.jar
 #echo "JDBC_DRIVER environment variable not set. Assumed path: $JDBC_DRIVER"
 fi
 if [ "$GIGI_EXEC" == "" ]

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 8ee811db5e20a77c1b0c16c842d8a89b8669fc1e..ac8d5aabc33aa65ec981f416d5e50504a8d4b981 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -375,7 +375,7 @@ public class Certificate {
         // TODO caching?
         try {
             String concat = "group_concat(concat('/', `name`, '=', REPLACE(REPLACE(value, '\\\\', '\\\\\\\\'), '/', '\\\\/')))";
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certs.id, " + concat + " as subject, md, csr_name, crt_name,memid, profile, certs.serial FROM `certs` LEFT JOIN certAvas ON certAvas.`certId`=certs.id WHERE certs.id=? GROUP BY certs.id");
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certs.id, " + concat + " as subject, md, csr_name, crt_name,memid, profile, certs.serial FROM `certs` LEFT JOIN `certAvas` ON `certAvas`.`certId`=certs.id WHERE certs.id=? GROUP BY certs.id");
             ps.setInt(1, id);
             GigiResultSet rs = ps.executeQuery();