IGNITE-19759 SQL Calcite: Fix list of reserved keywords - Fixes #10839.

Signed-off-by: Aleksey Plekhanov <[email protected]>
apache · Jul 21, 2023 · a3b0e9f · a3b0e9f
1 parent c9f4d54
commit a3b0e9f
Show file tree

Hide file tree

Showing 7 changed files with 16,589 additions and 12,510 deletions.
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
@@ -264,26 +264,47 @@
                                     <outputDirectory>${project.build.directory}/</outputDirectory>
                                     <includes>codegen/templates/Parser.jj</includes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.calcite</groupId>
+                                    <artifactId>calcite-core</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/</outputDirectory>
+                                    <includes>codegen/default_config.fmpp</includes>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.googlecode.fmpp-maven-plugin</groupId>
-                <artifactId>fmpp-maven-plugin</artifactId>
-                <version>1.0</version>
-                <configuration>
-                    <cfgFile>${project.build.directory}/codegen/config.fmpp</cfgFile>
-                    <templateDirectory>${project.build.directory}/codegen/templates</templateDirectory>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>net.sourceforge.fmpp</groupId>
+                        <artifactId>fmpp</artifactId>
+                        <version>0.9.16</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>generate-fmpp-sources</id>
                         <phase>validate</phase>
                         <goals>
-                            <goal>generate</goal>
+                            <goal>run</goal>
                         </goals>
+                        <configuration>
+                            <target>
+                                <taskdef name="fmpp" classname="fmpp.tools.AntTask" />
+                                <fmpp
+                                    configuration="${project.build.directory}/codegen/config.fmpp"
+                                    sourceRoot="${project.build.directory}/codegen/templates"
+                                    outputRoot="${project.build.directory}/generated-sources/fmpp"
+                                    data="tdd(${project.build.directory}/codegen/config.fmpp), default: tdd(${project.build.directory}/codegen/default_config.fmpp)"
+                                />
+                            </target>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>