Merge pull request #47979 from mbladel/hql-console-panache

HQL console transaction fix for panache entities

Author: yrodiere

extensions/hibernate-orm/deployment/src/main/resources/dev-ui/hibernate-orm-hql-console.js

@@ -402,19 +402,22 @@ export class HibernateOrmHqlConsoleComponent extends QwcHotReloadElement {
     }
 
     _cellRenderer(value) {
-        if (value) {
-            if (value === 'true') {
-                return html`
-                    <vaadin-icon style="color: var(--lumo-contrast-50pct);" title="${value}"
-                                 icon="font-awesome-regular:square-check"></vaadin-icon>`;
-            } else if (value === 'false') {
-                return html`
-                    <vaadin-icon style="color: var(--lumo-contrast-50pct);" title="${value}"
-                                 icon="font-awesome-regular:square"></vaadin-icon>`;
-            } else if (typeof value === 'string' && (value.startsWith('http://') || value.startsWith('https://'))) {
+        if ( value === true ) {
+            return html`
+                <vaadin-icon style="color: var(--lumo-contrast-50pct);" title="${value}"
+                             icon="font-awesome-regular:square-check"></vaadin-icon>`;
+        }
+        else if ( value === false ) {
+            return html`
+                <vaadin-icon style="color: var(--lumo-contrast-50pct);" title="${value}"
+                             icon="font-awesome-regular:square"></vaadin-icon>`;
+        }
+        else if ( value ) {
+            if ( typeof value === 'string' && (value.startsWith( 'http://' ) || value.startsWith( 'https://' )) ) {
                 return html`<a href="${value}" target="_blank">${value}</a>`;
-            } else {
-                const s = typeof value === 'object' ? JSON.stringify(value) : value;
+            }
+            else {
+                const s = typeof value === 'object' ? JSON.stringify( value ) : value;
                 return html`<span>${s}</span>`;
             }
         }

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/dev/HibernateOrmDevJsonRpcService.java

@@ -104,22 +104,20 @@ public JsonRpcMessage<Object> executeHQL(String persistenceUnit, String hql, Int
         }
 
         return sf.fromSession(session -> {
+            Transaction transaction = session.beginTransaction();
             try {
                 Query<Object> query = session.createQuery(hql, null);
                 if (isMutation(((SqmQuery) query).getSqmStatement())) {
                     // DML query, execute update within transaction and return custom message with affected rows
-                    Transaction transaction = session.beginTransaction();
-                    try {
-                        int updateCount = query.executeUpdate();
-                        transaction.commit();
-
-                        String message = "Query executed correctly. Rows affected: " + updateCount;
-                        return new JsonRpcMessage<>(new DataSet(null, -1, message, null), MessageType.Response);
-                    } catch (Exception e) {
-                        // an error happened in executeUpdate() or during commit
-                        transaction.rollback();
-                        throw e;
-                    }
+                    int updateCount = query.executeUpdate();
+                    transaction.commit();
+                    return new JsonRpcMessage<>(
+                            new DataSet(
+                                    null,
+                                    -1,
+                                    "Query executed correctly. Rows affected: " + updateCount,
+                                    null),
+                            MessageType.Response);
                 } else {
                     // selection query, execute count query and return paged results
 
@@ -139,10 +137,13 @@ public JsonRpcMessage<Object> executeHQL(String persistenceUnit, String hql, Int
                         String result = writeValueAsString(new DataSet(results, resultCount, null, null));
                         JsonRpcMessage<Object> message = new JsonRpcMessage<>(result, MessageType.Response);
                         message.setAlreadySerialized(true);
+                        transaction.commit();
                         return message;
                     }
                 }
             } catch (Exception ex) {
+                // an error happened, rollback the transaction
+                transaction.rollback();
                 return new JsonRpcMessage<>(new DataSet(null, -1, null, ex.getMessage()), MessageType.Response);
             }
         });