Handle double quote in z prefix resources (#1412)

aklivity · Feb 24, 2025 · d5649db · d5649db
1 parent bb9436e
commit d5649db
Show file tree

Hide file tree

Showing 21 changed files with 758 additions and 79 deletions.
diff --git a/...ty/zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaKeyAvroSchemaTemplate.java b/...ty/zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaKeyAvroSchemaTemplate.java
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateTable;
+import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZtable;
 
 public class PgsqlKafkaKeyAvroSchemaTemplate extends PgsqlKafkaAvroSchemaTemplate
 {
@@ -31,7 +31,7 @@ public PgsqlKafkaKeyAvroSchemaTemplate(
 
     public String generate(
         String database,
-        CreateTable command)
+        CreateZtable command)
     {
         final String newNamespace = namespace.replace(DATABASE_PLACEHOLDER, database);
 

diff --git a/.../zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaValueAvroSchemaTemplate.java b/.../zilla/runtime/binding/pgsql/kafka/internal/schema/PgsqlKafkaValueAvroSchemaTemplate.java
@@ -26,7 +26,7 @@
 import jakarta.json.JsonValue;
 
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.Alter;
-import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateTable;
+import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZtable;
 
 public class PgsqlKafkaValueAvroSchemaTemplate extends PgsqlKafkaAvroSchemaTemplate
 {
@@ -39,7 +39,7 @@ public PgsqlKafkaValueAvroSchemaTemplate(
     }
 
     public String generate(
-        CreateTable command)
+        CreateZtable command)
     {
         final String newNamespace = namespace.replace(DATABASE_PLACEHOLDER, command.schema());
 

diff --git a/...io/aklivity/zilla/runtime/binding/pgsql/kafka/internal/stream/PgsqlKafkaProxyFactory.java b/...io/aklivity/zilla/runtime/binding/pgsql/kafka/internal/stream/PgsqlKafkaProxyFactory.java
@@ -55,7 +55,7 @@
 import io.aklivity.zilla.runtime.binding.pgsql.kafka.internal.types.stream.WindowFW;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.PgsqlParser;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.Alter;
-import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateTable;
+import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZtable;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.Drop;
 import io.aklivity.zilla.runtime.engine.EngineContext;
 import io.aklivity.zilla.runtime.engine.binding.BindingHandler;
@@ -1336,7 +1336,7 @@ private void decodeCreateTopicCommand(
         }
         else if (server.commandsProcessed == 0)
         {
-            final CreateTable createTopic = parser.parseCreateTable(statement);
+            final CreateZtable createTopic = parser.parseCreateTable(statement);
             final String schema = createTopic.schema();
             final String topic = createTopic.name();
 

diff --git a/...nding-pgsql/src/main/java/io/aklivity/zilla/runtime/binding/pgsql/parser/PgsqlParser.java b/...nding-pgsql/src/main/java/io/aklivity/zilla/runtime/binding/pgsql/parser/PgsqlParser.java
@@ -39,8 +39,8 @@
 import io.aklivity.zilla.runtime.binding.pgsql.parser.listener.SqlShowListener;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.Alter;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateFunction;
-import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateTable;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZfunction;
+import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZtable;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZview;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.model.Drop;
 
@@ -88,7 +88,7 @@ public String parseCommand(
         return commandListener.command();
     }
 
-    public CreateTable parseCreateTable(
+    public CreateZtable parseCreateTable(
         String sql)
     {
         parser(sql, createTableListener);

diff --git a/.../io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlAlterZtableTopicListener.java b/.../io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlAlterZtableTopicListener.java
@@ -61,7 +61,7 @@ public void enterRoot(
     public void enterQualified_name(
         PostgreSqlParser.Qualified_nameContext ctx)
     {
-        String text = ctx.getText();
+        String text = ctx.getText().replace("\"", "");
         String[] split = text.split(SCHEMA_PATTERN);
         schema = split.length > 1 ? split[0] : PUBLIC_SCHEMA_NAME;
         name = split.length > 1 ? split[1] : text;

diff --git a/...a/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCreateZfunctionListener.java b/...a/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCreateZfunctionListener.java
@@ -99,7 +99,7 @@ public void enterRoot(
     public void enterCreatezfunctionstmt(
         PostgreSqlParser.CreatezfunctionstmtContext ctx)
     {
-        String text = ctx.func_name().getText();
+        String text = ctx.func_name().getText().replace("\"", "");
         String[] split = text.split(SCHEMA_PATTERN);
         schema = split.length > 1 ? split[0] : PUBLIC_SCHEMA_NAME;
         name = split.length > 1 ? split[1] : text;

diff --git a/...io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCreateZtableTopicListener.java b/...io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCreateZtableTopicListener.java
@@ -23,15 +23,15 @@
 
 import io.aklivity.zilla.runtime.binding.pgsql.parser.PostgreSqlParser;
 import io.aklivity.zilla.runtime.binding.pgsql.parser.PostgreSqlParserBaseListener;
-import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateTable;
-import io.aklivity.zilla.runtime.binding.pgsql.parser.model.TableColumn;
+import io.aklivity.zilla.runtime.binding.pgsql.parser.model.CreateZtable;
+import io.aklivity.zilla.runtime.binding.pgsql.parser.model.ZtableColumn;
 
 public class SqlCreateZtableTopicListener extends PostgreSqlParserBaseListener
 {
     private static final String PUBLIC_SCHEMA_NAME = "public";
     private static final String SCHEMA_PATTERN = "\\.";
 
-    private final List<TableColumn> columns;
+    private final List<ZtableColumn> columns;
     private final Set<String> primaryKeys;
     private final TokenStream tokens;
 
@@ -46,9 +46,9 @@ public SqlCreateZtableTopicListener(
         this.tokens = tokens;
     }
 
-    public CreateTable table()
+    public CreateZtable table()
     {
-        return new CreateTable(schema, name, columns, primaryKeys);
+        return new CreateZtable(schema, name, columns, primaryKeys);
     }
 
     @Override
@@ -65,7 +65,7 @@ public void enterRoot(
     public void enterQualified_name(
         PostgreSqlParser.Qualified_nameContext ctx)
     {
-        String text = ctx.getText();
+        String text = ctx.getText().replace("\"", "");
         String[] split = text.split(SCHEMA_PATTERN);
         schema = split.length > 1 ? split[0] : PUBLIC_SCHEMA_NAME;
         name = split.length > 1 ? split[1] : text;
@@ -112,7 +112,7 @@ private void addColumn(
                 constraints.add(tokens.getText(constraint.colconstraintelem()).toUpperCase());
             }
         }
-        columns.add(new TableColumn(columnName, dataType, constraints));
+        columns.add(new ZtableColumn(columnName, dataType, constraints));
     }
 
     private void addPrimaryKey(

diff --git a/.../java/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCreateZviewListener.java b/.../java/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlCreateZviewListener.java
@@ -55,7 +55,7 @@ public void enterRoot(
     public void enterCreatezviewstmt(
         PostgreSqlParser.CreatezviewstmtContext ctx)
     {
-        String text = ctx.create_mv_target().qualified_name().getText();
+        String text = ctx.create_mv_target().qualified_name().getText().replace("\"", "");
         String[] split = text.split(SCHEMA_PATTERN);
         schema = split.length > 1 ? split[0] : PUBLIC_SCHEMA_NAME;
         name = split.length > 1 ? split[1] : text;

diff --git a/...rc/main/java/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlDropListener.java b/...rc/main/java/io/aklivity/zilla/runtime/binding/pgsql/parser/listener/SqlDropListener.java
@@ -50,7 +50,7 @@ public void enterDropstmt(
     {
         ctx.any_name_list().any_name().forEach(n ->
         {
-            String text = n.getText();
+            String text = n.getText().replace("\"", "");
             String[] split = text.split(SCHEMA_PATTERN);
             String schema = split.length > 1 ? split[0] : PUBLIC_SCHEMA_NAME;
             String name = split.length > 1 ? split[1] : text;

diff --git a/...nding/pgsql/parser/model/CreateTable.java → ...ding/pgsql/parser/model/CreateZtable.java b/...nding/pgsql/parser/model/CreateTable.java → ...ding/pgsql/parser/model/CreateZtable.java
@@ -17,10 +17,10 @@
 import java.util.List;
 import java.util.Set;
 
-public record CreateTable(
+public record CreateZtable(
     String schema,
     String name,
-    List<TableColumn> columns,
+    List<ZtableColumn> columns,
     Set<String> primaryKeys)
 {
 }
diff --git a/...nding/pgsql/parser/model/TableColumn.java → ...ding/pgsql/parser/model/ZtableColumn.java b/...nding/pgsql/parser/model/TableColumn.java → ...ding/pgsql/parser/model/ZtableColumn.java
@@ -16,7 +16,7 @@
 
 import java.util.List;
 
-public record TableColumn(
+public record ZtableColumn(
     String name,
     String type,
     List<String> constraints)