fix:context,maria json

Author: Zxc4wonder

backend/framework/src/main/java/org/jumpserver/chen/framework/console/QueryConsole.java

@@ -84,15 +84,10 @@ public void onConnect(Connect connect) {
         try {
             var currentContext = this.getSqlActuator().getCurrentSchema();
 
-            if (StringUtils.isEmpty(currentContext) && !StringUtils.isEmpty(context)) {
+            if (!StringUtils.isEmpty(context) && !StringUtils.equals(currentContext, context)) {
                 this.getSqlActuator().changeSchema(context);
-                this.getState().setCurrentContext(context);
-            } else {
-                if (!StringUtils.isEmpty(context) && !currentContext.equals(context)) {
-                    this.getSqlActuator().changeSchema(context);
-                    this.getState().setCurrentContext(context);
-                }
             }
+            this.getState().setCurrentContext(StringUtils.defaultIfEmpty(context, currentContext));
 
             var schemas = this.getSqlActuator().getSchemas();
             this.getState().setContexts(schemas);

backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java

@@ -195,7 +195,7 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery
                     List<Object> fs = new ArrayList<>();
                     for (int i = 1; i <= columnCount; i++) {
                         try {
-                            fs.add(this.normalizeJdbcValue(resultSet.getObject(i)));
+                            fs.add(this.normalizeJdbcValue(resultSet, i));
                         } catch (NoClassDefFoundError e) {
                             log.error(e.getMessage());
                         }
@@ -222,11 +222,19 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery
         }
     }
 
+    protected Object normalizeJdbcValue(ResultSet resultSet, int columnIndex) throws SQLException {
+        return this.normalizeJdbcValue(resultSet.getObject(columnIndex));
+    }
+
     protected Object normalizeJdbcValue(Object value) throws SQLException {
         if (value == null) {
             return null;
         }
 
+        if (value.getClass().getName().equals("oracle.sql.TIMESTAMPTZ")) {
+            return this.normalizeOracleTimestampWithTimeZone(value);
+        }
+
         var temporalValue = this.formatTemporalValue(value);
         if (temporalValue != null) {
             return temporalValue;
@@ -257,9 +265,6 @@ protected Object normalizeJdbcValue(Object value) throws SQLException {
         }
 
         if (value instanceof Blob blob) {
-            if (blob.getClass().getName().equals("oracle.sql.BLOB")) {
-                return blob.toString();
-            }
             return HexUtils.bytesToHex(blob.getBytes(1, (int) blob.length()));
         }
 
@@ -274,6 +279,19 @@ protected Object normalizeJdbcValue(Object value) throws SQLException {
         return value;
     }
 
+    private String normalizeOracleTimestampWithTimeZone(Object value) throws SQLException {
+        try {
+            var offsetDateTime = value.getClass().getMethod("toOffsetDateTime").invoke(value);
+            return OFFSET_DATE_TIME_DISPLAY_FORMATTER.format((OffsetDateTime) offsetDateTime);
+        } catch (ReflectiveOperationException | ClassCastException e) {
+            var cause = e.getCause() == null ? e : e.getCause();
+            if (cause instanceof SQLException sqlException) {
+                throw sqlException;
+            }
+            throw new SQLException("normalize Oracle TIMESTAMP WITH TIME ZONE failed", cause);
+        }
+    }
+
     private String formatTemporalValue(Object value) {
         if (value instanceof Timestamp timestamp) {
             return LOCAL_DATE_TIME_DISPLAY_FORMATTER.format(timestamp.toLocalDateTime());

backend/modules/src/main/java/org.jumpserver.chen.modules/mariadb/MariaDBActuator.java

@@ -4,6 +4,8 @@
 import org.jumpserver.chen.modules.mysql.MysqlActuator;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class MariaDBActuator extends MysqlActuator {
     public MariaDBActuator(ConnectionManager connectionManager) {
@@ -12,4 +14,13 @@ public MariaDBActuator(ConnectionManager connectionManager) {
     public MariaDBActuator(MariaDBActuator sqlActuator, Connection connection) {
         super(sqlActuator, connection);
     }
+
+    @Override
+    protected Object normalizeJdbcValue(ResultSet resultSet, int columnIndex) throws SQLException {
+        var columnTypeName = resultSet.getMetaData().getColumnTypeName(columnIndex);
+        if ("JSON".equalsIgnoreCase(columnTypeName) || "MYSQL_JSON".equalsIgnoreCase(columnTypeName)) {
+            return resultSet.getString(columnIndex);
+        }
+        return super.normalizeJdbcValue(resultSet, columnIndex);
+    }
 }