Skip to content

Commit 54c26de

Browse files
authored
Merge pull request #564 from jeddict/copilot/fix-jpql-executor-method
Upgrade to NetBeans RELEASE290 and fix JPQLExecutor API incompatibilities
2 parents 68806e0 + 3f9da7c commit 54c26de

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

jpa-modeler/src/main/java/io/github/jeddict/jpa/modeler/internal/jpqleditor/JPQLEditorPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ public void run() {
332332

333333
ph2.progress(50);
334334
ph2.setDisplayName(NbBundle.getMessage(JPQLEditorPanel.class, "queryParsingPassControlToProvider"));
335-
jpqlResult = queryExecutor.execute(jpql, selectedConfigObject, pe, props, provider, 0, ph2, false);
335+
jpqlResult = queryExecutor.execute(jpql, puObject.getPersistence(), selectedConfigObject, pe, props, provider, 0, ph2, false);
336336
ph2.progress(80);
337337
ph2.setDisplayName(NbBundle.getMessage(JPQLEditorPanel.class, "queryParsingProcessResults"));
338338

@@ -950,6 +950,7 @@ private void runJPQLButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN
950950
PersistenceUnit pu = (PersistenceUnit) puConfigMap.get(puComboBox.getSelectedItem());
951951
ph.start(100);
952952
getController().executeJPQLQuery(jpqlEditor.getText(),
953+
puObject.getPersistence(),
953954
pu,
954955
pe,
955956
getMaxRowCount(),

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<properties>
2525
<root.dir>${basedir}</root.dir>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27-
<netbeans.version>RELEASE270</netbeans.version>
27+
<netbeans.version>RELEASE290</netbeans.version>
2828
<netbeans.installation>${root.dir}/../incubator-netbeans/nbbuild/netbeans</netbeans.installation>
2929
<nbm.cluster>jeddict</nbm.cluster>
3030
<nbm.build.dir>${root.dir}/../jeddict-cluster</nbm.build.dir>

0 commit comments

Comments
 (0)