Update libpg_query to 17-6.0.0

premium-minds · Nov 4, 2024 · 310dcd0 · 310dcd0
1 parent 65d7ed4
commit 310dcd0
Show file tree

Hide file tree

Showing 138 changed files with 49,205 additions and 21,394 deletions.
diff --git a/Token.java.patch b/Token.java.patch
@@ -1,17 +1,26 @@
 diff --git a/src/main/java/com/premiumminds/sonar/postgres/protobuf/Token.java b/src/main/java/com/premiumminds/sonar/postgres/protobuf/Token.java
-index 0748d8e..4fbf021 100644
+index 13968c6..8ffb3a2 100644
 --- a/src/main/java/com/premiumminds/sonar/postgres/protobuf/Token.java
 +++ b/src/main/java/com/premiumminds/sonar/postgres/protobuf/Token.java
-@@ -4941,7 +4941,7 @@ public enum Token
-     return com.premiumminds.sonar.postgres.protobuf.PgQuery.getDescriptor().getEnumTypes().get(63);
+@@ -3347,7 +3347,7 @@ public enum Token
+   /**
+    * <code>JSON = 485;</code>
+    */
+-  public static final int JSON_VALUE = 485;
++  public static final int JSON_ENUM_VALUE = 485;
+   /**
+    * <code>JSON_ARRAY = 486;</code>
+    */
+@@ -5121,7 +5121,7 @@ public enum Token
+     return com.premiumminds.sonar.postgres.protobuf.PgQuery.getDescriptor().getEnumTypes().get(70);
    }
 
 -  private static final Token[] VALUES = values();
 +  private static final Token[] INTERNAL_VALUES = values();
 
    public static Token valueOf(
        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-@@ -4952,7 +4952,7 @@ public enum Token
+@@ -5132,7 +5132,7 @@ public enum Token
      if (desc.getIndex() == -1) {
        return UNRECOGNIZED;
      }

diff --git a/generate_libpg_query.sh b/generate_libpg_query.sh
@@ -8,9 +8,9 @@ LIBPG_QUERY_TEMP_DIR=$(mktemp --directory)
 
 pushd $LIBPG_QUERY_TEMP_DIR
 
-wget -q https://github.com/pganalyze/libpg_query/archive/refs/tags/16-5.1.0.zip
-unzip 16-5.1.0.zip
-SOURCES_DIR=libpg_query-16-5.1.0
+wget -q https://github.com/pganalyze/libpg_query/archive/refs/tags/17-6.0.0.zip
+unzip 17-6.0.0.zip
+SOURCES_DIR=libpg_query-17-6.0.0
 
 echo "compile linux-x86-64"
 docker create \
@@ -64,7 +64,7 @@ docker cp crossbuild:/work/$SOURCES_DIR/libpg_query.dylib \
 docker rm crossbuild
 
 echo "compile darwin-aarch64"
-docker create --name crossbuild --workdir /work/$SOURCES_DIR darwin-build-support bash -c 'patch -p1 < /work/darwin.patch; make CC=aarch64-apple-darwin22.2-cc -j build_shared'
+docker create --name crossbuild --workdir /work/$SOURCES_DIR darwin-build-support bash -c 'patch -p1 < /work/darwin.patch; make CC=aarch64-apple-darwin23.6-cc -j build_shared'
 docker cp $SOURCES_DIR crossbuild:/work/
 docker cp $PROJECT_DIR/darwin.patch crossbuild:/work/darwin.patch
 docker start -ai crossbuild

diff --git a/src/main/java/com/premiumminds/sonar/postgres/protobuf/A_Expr_Kind.java b/src/main/java/com/premiumminds/sonar/postgres/protobuf/A_Expr_Kind.java
diff --git a/src/main/java/com/premiumminds/sonar/postgres/protobuf/AggSplit.java b/src/main/java/com/premiumminds/sonar/postgres/protobuf/AggSplit.java
diff --git a/src/main/java/com/premiumminds/sonar/postgres/protobuf/AggStrategy.java b/src/main/java/com/premiumminds/sonar/postgres/protobuf/AggStrategy.java
diff --git a/src/main/java/com/premiumminds/sonar/postgres/protobuf/AlterPublicationAction.java b/src/main/java/com/premiumminds/sonar/postgres/protobuf/AlterPublicationAction.java