Update SQL.java

Author: intisy

src/main/java/io/github/intisy/utils/database/SQL.java

@@ -317,34 +317,24 @@ public List<Map<String, Object>> executeQuery(String sql, List<?> params) {
         try (PreparedStatement pstmt = getConnection().prepareStatement(sql)) {
             bindParameters(pstmt, params);
 
-            boolean isQuery = sql.trim().toLowerCase().startsWith("select");
-            
-            if (isQuery) {
-                try (ResultSet rs = pstmt.executeQuery()) {
-                    ResultSetMetaData metaData = rs.getMetaData();
-                    int columnCount = metaData.getColumnCount();
-
-                    while (rs.next()) {
-                        Map<String, Object> row = new LinkedHashMap<>();
-                        for (int i = 1; i <= columnCount; i++) {
-                            String colName = metaData.getColumnLabel(i);
-                            if (colName == null || colName.isEmpty()) {
-                                colName = metaData.getColumnName(i);
-                            }
-                            row.put(colName, rs.getObject(i));
+            try (ResultSet rs = pstmt.executeQuery()) {
+                ResultSetMetaData metaData = rs.getMetaData();
+                int columnCount = metaData.getColumnCount();
+
+                while (rs.next()) {
+                    Map<String, Object> row = new LinkedHashMap<>();
+                    for (int i = 1; i <= columnCount; i++) {
+                        String colName = metaData.getColumnLabel(i);
+                        if (colName == null || colName.isEmpty()) {
+                            colName = metaData.getColumnName(i);
                         }
-                        results.add(row);
+                        row.put(colName, rs.getObject(i));
                     }
+                    results.add(row);
                 }
-                logger.debug("Query returned " + results.size() + " rows");
-            } else {
-                int affected = pstmt.executeUpdate();
-                logger.debug("Update affected " + affected + " rows");
-                Map<String, Object> resultRow = new LinkedHashMap<>();
-                resultRow.put("affectedRows", affected);
-                results.add(resultRow);
             }
-            
+
+            logger.debug("Query returned " + results.size() + " rows");
             return results;
         } catch (SQLException e) {
             logger.error("Query failed: " + e.getMessage() + " [SQL: " + sql + "]");
@@ -1033,15 +1023,15 @@ public long count(String tableName, Map<String, Object> whereClause) {
         validateIdentifier(tableName);
 
         StringBuilder sql = new StringBuilder("SELECT COUNT(*) FROM ")
-            .append(quoteIdentifier(tableName));
+                .append(quoteIdentifier(tableName));
 
         List<Object> whereValues = new ArrayList<>();
         if (whereClause != null && !whereClause.isEmpty()) {
             List<String> whereConditions = new ArrayList<>();
             for (Map.Entry<String, Object> entry : whereClause.entrySet()) {
                 validateIdentifier(entry.getKey());
                 whereConditions.add(quoteIdentifier(entry.getKey()) +
-                    (entry.getValue() == null ? " IS ?" : " = ?"));
+                        (entry.getValue() == null ? " IS ?" : " = ?"));
                 whereValues.add(entry.getValue());
             }
             sql.append(" WHERE ").append(String.join(" AND ", whereConditions));
@@ -1065,7 +1055,7 @@ public long count(String tableName, Map<String, Object> whereClause) {
             }
         } catch (SQLException e) {
             logger.error("Count failed for table '" + tableName + "': " +
-                e.getMessage() + " [SQL: " + sqlString + "]");
+                    e.getMessage() + " [SQL: " + sqlString + "]");
             throw new RuntimeException(e);
         }
     }
@@ -1096,4 +1086,4 @@ public void execute(String sql, List<?> params) {
     public void execute(String sql, Object... params) {
         execute(sql, Arrays.asList(params));
     }
-}
+}