Merge branch 'master' into bugs-in-db

Author: man-zhang

.github/workflows/ci.yml

@@ -405,6 +405,47 @@ jobs:
           CI_env: GithubAction
 
 
+  python-bb-e2e:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    needs: setup
+    if: needs.setup.outputs.debug == 'false'
+    steps:
+      - uses: actions/checkout@v6
+      - name: Setup JDK ${{env.build-jdk}}
+        uses: actions/setup-java@v5
+        with:
+          distribution: ${{env.java-distribution}}
+          java-version: ${{env.build-jdk}}
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.10'
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Cache Maven packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build with Maven
+        run: mvn clean install -DskipTests
+        env:
+          CI_env: GithubAction
+      - name: Run Python/Django BB E2E tests
+        # important that what we run here does not use Docker
+        working-directory: core-tests/e2e-tests/python-rest-bb
+        run: mvn clean verify --fae
+        env:
+          CI_env: GithubAction
+
+
   tests:
     runs-on: ubuntu-latest
     needs: full-build-base

.gitignore

@@ -130,6 +130,16 @@ Migrations/
 /core-tests/e2e-tests/spring/spring-rest-bb/javascript/generated/
 /core-tests/e2e-tests/spring/spring-rest-bb/python/generated/
 
+/core-tests/e2e-tests/python-rest-bb/target/
+/core-tests/e2e-tests/python-rest-bb/python/generated/
+/core-tests/e2e-tests/python-rest-bb/maven/src/
+/core-tests/e2e-tests/python-rest-bb/maven/target/
+/core-tests/e2e-tests/python-rest-bb/javascript/node_modules/
+/core-tests/e2e-tests/python-rest-bb/javascript/generated/
+/core-tests/e2e-tests/python-rest-bb/sut/django/db.sqlite3
+/core-tests/e2e-tests/python-rest-bb/sut/django/.venv/
+/core-tests/e2e-tests/python-rest-bb/sut/django/**/__pycache__/
+
 /client-java/test-utils-java/target/
 
 /test-utils/test-utils-py/target/

client-java/controller/pom.xml

@@ -122,6 +122,10 @@
             <groupId>com.github.jsqlparser</groupId>
             <artifactId>jsqlparser</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -346,12 +350,22 @@
                                     <pattern>net.sf.jsqlparser</pattern>
                                     <shadedPattern>shaded.net.sf.jsqlparser</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.antlr</pattern>
+                                    <shadedPattern>shaded.org.antlr</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
+            <!-- Generates the Cypher parser from the Neo4j Cypher25 grammar -->
+            <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-maven-plugin</artifactId>
+            </plugin>
+
         </plugins>
     </build>