You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2020/03/04 16:07:41 UTC
svn commit: r1874804 - in /jackrabbit/oak/branches/1.22: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Author: reschke
Date: Wed Mar 4 16:07:40 2020
New Revision: 1874804
URL: http://svn.apache.org/viewvc?rev=1874804&view=rev
Log:
OAK-8906: RDBDocumentStore on SQL Server (additional diags) log DB creation time (merged r1874021 into 1.22)
Modified:
jackrabbit/oak/branches/1.22/ (props changed)
jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Propchange: jackrabbit/oak/branches/1.22/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1874021
Modified: jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1874804&r1=1874803&r2=1874804&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original)
+++ jackrabbit/oak/branches/1.22/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Wed Mar 4 16:07:40 2020
@@ -699,15 +699,16 @@ public enum RDBDocumentStoreDB {
Connection con = null;
PreparedStatement stmt = null;
ResultSet rs = null;
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
try {
con = ch.getROConnection();
String cat = con.getCatalog();
- stmt = con.prepareStatement("SELECT collation_name FROM sys.databases WHERE name=?");
+ stmt = con.prepareStatement("SELECT collation_name, create_date FROM sys.databases WHERE name=?");
stmt.setString(1, cat);
rs = stmt.executeQuery();
while (rs.next()) {
- result.put("collation_name", rs.getString(1));
+ result.put("collation_name", rs.getString("collation_name"));
+ result.put("create_date", rs.getString("create_date"));
}
rs.close();
stmt.close();