From 5bb2fd699866f3b64f28f14437df71290f8131ae Mon Sep 17 00:00:00 2001
From: Nikolay Izhikov <nizhikov@apache.org>
Date: Thu, 15 Oct 2026 17:17:29 +0300
Subject: [PATCH 1/3] IGNITE-29117 Fix test to forcefully use H2 engine,
 because of Calcite default

---
 tests/config/ignite-config.xml.jinja2 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/config/ignite-config.xml.jinja2 b/tests/config/ignite-config.xml.jinja2
index 22b103e..208cb5f 100644
--- a/tests/config/ignite-config.xml.jinja2
+++ b/tests/config/ignite-config.xml.jinja2
@@ -27,6 +27,20 @@
         http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+        <!-- The tests and the examples use the SQL dialect of the H2-based engine. -->
+        <property name="sqlConfiguration">
+            <bean class="org.apache.ignite.configuration.SqlConfiguration">
+                <property name="queryEnginesConfiguration">
+                    <list>
+                        <bean class="org.apache.ignite.indexing.IndexingQueryEngineConfiguration">
+                            <property name="default" value="true"/>
+                        </bean>
+                        <bean class="org.apache.ignite.calcite.CalciteQueryEngineConfiguration"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+
         <property name="dataStorageConfiguration">
             <bean class="org.apache.ignite.configuration.DataStorageConfiguration">
                 <property name="defaultDataRegionConfiguration">

From 90bebe64ffb75243857a7a8b520247579bbeedca Mon Sep 17 00:00:00 2001
From: Nikolay <nizhikov@apache.org>
Date: Mon, 19 Oct 2026 09:21:16 +0300
Subject: [PATCH 2/3] Update ignite-config.xml.jinja2

---
 tests/config/ignite-config.xml.jinja2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/config/ignite-config.xml.jinja2 b/tests/config/ignite-config.xml.jinja2
index 208cb5f..399bdd9 100644
--- a/tests/config/ignite-config.xml.jinja2
+++ b/tests/config/ignite-config.xml.jinja2
@@ -27,7 +27,6 @@
         http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-        <!-- The tests and the examples use the SQL dialect of the H2-based engine. -->
         <property name="sqlConfiguration">
             <bean class="org.apache.ignite.configuration.SqlConfiguration">
                 <property name="queryEnginesConfiguration">

From e5c67ea99ec01b3bc675df5e4fcb85ddce73d4c3 Mon Sep 17 00:00:00 2001
From: Nikolay Izhikov <nizhikov@apache.org>
Date: Tue, 20 Oct 2026 11:42:19 +0300
Subject: [PATCH 3/3] IGNITE-29117 Use the regular Ignite distribution in the
 PR check to have the Calcite module

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 .github/workflows/pr_check.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
index f9f5f98..ac09212 100644
--- a/.github/workflows/pr_check.yml
+++ b/.github/workflows/pr_check.yml
@@ -46,10 +46,12 @@ jobs:
           python-version: ${{ matrix.cfg.python}}
       - name: Install Apache Ignite
         run: |
-          curl -L https://archive.apache.org/dist/ignite/${IGNITE_VERSION}/apache-ignite-slim-${IGNITE_VERSION}-bin.zip > ignite.zip
+          curl -L https://archive.apache.org/dist/ignite/${IGNITE_VERSION}/apache-ignite-${IGNITE_VERSION}-bin.zip > ignite.zip
           unzip ignite.zip -d /opt
-          mv /opt/apache-ignite-slim-${IGNITE_VERSION}-bin /opt/ignite
+          mv /opt/apache-ignite-${IGNITE_VERSION}-bin /opt/ignite
           mv /opt/ignite/libs/optional/ignite-log4j2 /opt/ignite/libs/
+          # The test configuration references both SQL engines: the Calcite module is optional before Ignite 2.19.
+          mv /opt/ignite/libs/optional/ignite-calcite /opt/ignite/libs/
 
       - name: Install tox
         run: |