From 68d8312d9eeb17530ef07f89d6271387beda28f4 Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Mon, 27 Dec 2021 15:34:12 +0300 Subject: [PATCH] feat(server): CB-1477 change parameters pass order --- .../io/cloudbeaver/server/CBSecurityController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java index f2667be4dc..6d74f12deb 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java @@ -275,8 +275,8 @@ class CBSecurityController implements DBWSecurityController { try (ResultSet dbResult = dbStat.executeQuery()) { while (dbResult.next()) { result.put( - dbResult.getString(1), - dbResult.getString(2)); + dbResult.getString(2), + dbResult.getString(3)); } } } @@ -301,13 +301,13 @@ class CBSecurityController implements DBWSecurityController { // Update/Insert parameter boolean updated; try (PreparedStatement dbStat = dbCon.prepareStatement("UPDATE CB_USER_PARAMETERS SET PARAM_VALUE=? WHERE USER_ID=? AND PARAM_ID=?")) { - dbStat.setString(1, userId); - dbStat.setString(2, CommonUtils.toString(value)); + dbStat.setString(1, CommonUtils.toString(value)); + dbStat.setString(2, userId); dbStat.setString(3, name); updated = dbStat.executeUpdate() > 0; } if (!updated) { - try (PreparedStatement dbStat = dbCon.prepareStatement("INSERT INTO INTO CB_USER_PARAMETERS (USER_ID,PARAM_ID,PARAM_VALUE) VALUES(?,?,?)")) { + try (PreparedStatement dbStat = dbCon.prepareStatement("INSERT INTO CB_USER_PARAMETERS (USER_ID,PARAM_ID,PARAM_VALUE) VALUES(?,?,?)")) { dbStat.setString(1, userId); dbStat.setString(2, name); dbStat.setString(3, CommonUtils.toString(value));