408912 JDBCSessionIdManager should allow configuration of schema

1 files changed, 27 insertions, 3 deletions

diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
index 3305e006d5..bdd3f02417 100644
--- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
+++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
@@ -84,6 +84,26 @@ public class JdbcTestServer extends AbstractTestServer
             idManager.setScavengeInterval(_scavengePeriod);
             idManager.setWorkerName("w"+(__workers++));
             idManager.setDriverInfo(DRIVER_CLASS, (config==null?DEFAULT_CONNECTION_URL:config));
+            JDBCSessionIdManager.SessionIdTableSchema idTableSchema = new JDBCSessionIdManager.SessionIdTableSchema();
+            idTableSchema.setTableName("mysessionids");
+            idTableSchema.setIdColumn("myid");
+            idManager.setSessionIdTableSchema(idTableSchema);
+            
+            JDBCSessionIdManager.SessionTableSchema sessionTableSchema = new JDBCSessionIdManager.SessionTableSchema();
+            sessionTableSchema.setTableName("mysessions");
+            sessionTableSchema.setIdColumn("mysessionid");
+            sessionTableSchema.setAccessTimeColumn("atime");
+            sessionTableSchema.setContextPathColumn("cpath");
+            sessionTableSchema.setCookieTimeColumn("cooktime");
+            sessionTableSchema.setCreateTimeColumn("ctime");
+            sessionTableSchema.setExpiryTimeColumn("extime");
+            sessionTableSchema.setLastAccessTimeColumn("latime");
+            sessionTableSchema.setLastNodeColumn("lnode");
+            sessionTableSchema.setLastSavedTimeColumn("lstime");
+            sessionTableSchema.setMapColumn("mo");
+            sessionTableSchema.setMaxIntervalColumn("mi");           
+            idManager.setSessionTableSchema(sessionTableSchema);
+            
             return idManager;
         }
     }
@@ -109,7 +129,9 @@ public class JdbcTestServer extends AbstractTestServer
         try
         {
             con = DriverManager.getConnection(DEFAULT_CONNECTION_URL);
-            PreparedStatement statement = con.prepareStatement("select * from "+((JDBCSessionIdManager)_sessionIdManager)._sessionIdTable+" where id = ?");
+            PreparedStatement statement = con.prepareStatement("select * from "+
+                    ((JDBCSessionIdManager)_sessionIdManager)._sessionIdTableSchema.getTableName()+
+                    " where "+((JDBCSessionIdManager)_sessionIdManager)._sessionIdTableSchema.getIdColumn()+" = ?");
             statement.setString(1, id);
             ResultSet result = statement.executeQuery();
             return result.next();
@@ -130,7 +152,9 @@ public class JdbcTestServer extends AbstractTestServer
         try
         {
             con = DriverManager.getConnection(DEFAULT_CONNECTION_URL);
-            PreparedStatement statement = con.prepareStatement("select * from "+((JDBCSessionIdManager)_sessionIdManager)._sessionTable+" where sessionId = ?");
+            PreparedStatement statement = con.prepareStatement("select * from "+
+                    ((JDBCSessionIdManager)_sessionIdManager)._sessionTableSchema.getTableName()+
+                    " where "+((JDBCSessionIdManager)_sessionIdManager)._sessionTableSchema.getIdColumn()+" = ?");
             statement.setString(1, id);
             ResultSet result = statement.executeQuery();
             if (verbose)
@@ -163,7 +187,7 @@ public class JdbcTestServer extends AbstractTestServer
         try
         {
             con = DriverManager.getConnection(DEFAULT_CONNECTION_URL);
-            PreparedStatement statement = con.prepareStatement("select * from "+((JDBCSessionIdManager)_sessionIdManager)._sessionIdTable);
+            PreparedStatement statement = con.prepareStatement("select * from "+((JDBCSessionIdManager)_sessionIdManager)._sessionIdTableSchema.getTableName());
           
             ResultSet result = statement.executeQuery();
             while (result.next())