You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2021/11/26 15:07:57 UTC

[ignite-3] branch main updated: IGNITE-16005 Added ORDER BY clause to SqlJdbcExample. Fixes #473

This is an automated email from the ASF dual-hosted git repository.

sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 2d600a1  IGNITE-16005 Added ORDER BY clause to SqlJdbcExample. Fixes #473
2d600a1 is described below

commit 2d600a16a2052c5385a4b398d201827aaefed5d3
Author: Slava Koptilin <sl...@gmail.com>
AuthorDate: Fri Nov 26 18:07:38 2021 +0300

    IGNITE-16005 Added ORDER BY clause to SqlJdbcExample. Fixes #473
---
 .../java/org/apache/ignite/example/sql/jdbc/SqlJdbcExample.java    | 7 ++++---
 .../java/org/apache/ignite/example/sql/jdbc/SqlExamplesTest.java   | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/examples/src/main/java/org/apache/ignite/example/sql/jdbc/SqlJdbcExample.java b/examples/src/main/java/org/apache/ignite/example/sql/jdbc/SqlJdbcExample.java
index 78667b9..f422ab0 100644
--- a/examples/src/main/java/org/apache/ignite/example/sql/jdbc/SqlJdbcExample.java
+++ b/examples/src/main/java/org/apache/ignite/example/sql/jdbc/SqlJdbcExample.java
@@ -213,7 +213,7 @@ public class SqlJdbcExample {
                 try (Statement stmt = conn.createStatement()) {
                     try (ResultSet rs = stmt.executeQuery(
                             "SELECT a.FIRST_NAME, a.LAST_NAME, c.NAME FROM ACCOUNTS a "
-                                    + "INNER JOIN CITIES c on c.ID = a.CITY_ID")) {
+                                    + "INNER JOIN CITIES c on c.ID = a.CITY_ID ORDER BY a.ACCOUNT_ID")) {
                         while (rs.next()) {
                             System.out.println("    "
                                     + rs.getString(1) + ", "
@@ -233,7 +233,8 @@ public class SqlJdbcExample {
 
                 try (Statement stmt = conn.createStatement()) {
                     try (ResultSet rs = stmt.executeQuery(
-                            "SELECT a.FIRST_NAME, a.LAST_NAME, a.BALANCE FROM ACCOUNTS a WHERE a.BALANCE < 1500.0")) {
+                            "SELECT a.FIRST_NAME, a.LAST_NAME, a.BALANCE FROM ACCOUNTS a WHERE a.BALANCE < 1500.0 "
+                                    + "ORDER BY a.ACCOUNT_ID")) {
                         while (rs.next()) {
                             System.out.println("    "
                                     + rs.getString(1) + ", "
@@ -268,7 +269,7 @@ public class SqlJdbcExample {
                 try (Statement stmt = conn.createStatement()) {
                     try (ResultSet rs = stmt.executeQuery(
                             "SELECT a.FIRST_NAME, a.LAST_NAME, c.NAME FROM ACCOUNTS a "
-                                    + "INNER JOIN CITIES c on c.ID = a.CITY_ID")) {
+                                    + "INNER JOIN CITIES c on c.ID = a.CITY_ID ORDER BY a.ACCOUNT_ID")) {
                         while (rs.next()) {
                             System.out.println("    "
                                     + rs.getString(1) + ", "
diff --git a/examples/src/test/java/org/apache/ignite/example/sql/jdbc/SqlExamplesTest.java b/examples/src/test/java/org/apache/ignite/example/sql/jdbc/SqlExamplesTest.java
index b44525d..f6d9440 100644
--- a/examples/src/test/java/org/apache/ignite/example/sql/jdbc/SqlExamplesTest.java
+++ b/examples/src/test/java/org/apache/ignite/example/sql/jdbc/SqlExamplesTest.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -45,7 +44,6 @@ public class SqlExamplesTest {
      * @throws Exception If failed.
      */
     @Test
-    @Disabled("https://issues.apache.org/jira/browse/IGNITE-16005")
     public void testSqlJdbcExample() throws Exception {
         ExampleTestUtils.assertConsoleOutputContains(SqlJdbcExample::main, EMPTY_ARGS,
                 "\nAll accounts:\n"
@@ -88,7 +86,7 @@ public class SqlExamplesTest {
     }
 
     /**
-     * Removes a previously created work directory.
+     * Removes a work directory created by {@link SqlExamplesTest}.
      */
     @BeforeEach
     @AfterEach