diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/PgCatalogTableManager.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/PgCatalogTableManager.java index 5afe1ee4f..42cfc040b 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/PgCatalogTableManager.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/PgCatalogTableManager.java @@ -68,26 +68,26 @@ public class PgCatalogTableManager private Map initTables() { return ImmutableMap.builder() - .put(PgAmTable.NAME, new PgAmTable(this)) - .put(PgAttrdefTable.NAME, new PgAttrdefTable(this)) - .put(PgAttributeTable.NAME, new PgAttributeTable(this)) - .put(PgClassTable.NAME, new PgClassTable(this)) - .put(PgConstraintTable.NAME, new PgConstraintTable(this)) - .put(PgDatabaseTable.NAME, new PgDatabaseTable(this)) - .put(PgDescriptionTable.NAME, new PgDescriptionTable(this)) - .put(PgEnumTable.NAME, new PgEnumTable(this)) - .put(PgIndexTable.NAME, new PgIndexTable(this)) - .put(PgNamespaceTable.NAME, new PgNamespaceTable(this)) - .put(PgProcTable.NAME, new PgProcTable(this)) - .put(PgRangeTable.NAME, new PgRangeTable(this)) - .put(PgRolesTable.NAME, new PgRolesTable(this)) - .put(PgSettingsTable.NAME, new PgSettingsTable(this)) - .put(PgTablespaceTable.NAME, new PgTablespaceTable(this)) - .put(PgTypeTable.NAME, new PgTypeTable(this)) - .put(CharacterSets.NAME, new CharacterSets(this)) - .put(ReferentialConstraints.NAME, new ReferentialConstraints(this)) - .put(KeyColumnUsage.NAME, new KeyColumnUsage(this)) - .put(TableConstraints.NAME, new TableConstraints(this)) + .put(PgAmTable.NAME, new PgAmTable()) + .put(PgAttrdefTable.NAME, new PgAttrdefTable()) + .put(PgAttributeTable.NAME, new PgAttributeTable()) + .put(PgClassTable.NAME, new PgClassTable()) + .put(PgConstraintTable.NAME, new PgConstraintTable()) + .put(PgDatabaseTable.NAME, new PgDatabaseTable()) + .put(PgDescriptionTable.NAME, new PgDescriptionTable()) + .put(PgEnumTable.NAME, new PgEnumTable()) + .put(PgIndexTable.NAME, new PgIndexTable()) + .put(PgNamespaceTable.NAME, new PgNamespaceTable()) + .put(PgProcTable.NAME, new PgProcTable()) + .put(PgRangeTable.NAME, new PgRangeTable()) + .put(PgRolesTable.NAME, new PgRolesTable()) + .put(PgSettingsTable.NAME, new PgSettingsTable()) + .put(PgTablespaceTable.NAME, new PgTablespaceTable()) + .put(PgTypeTable.NAME, new PgTypeTable()) + .put(CharacterSets.NAME, new CharacterSets()) + .put(ReferentialConstraints.NAME, new ReferentialConstraints()) + .put(KeyColumnUsage.NAME, new KeyColumnUsage()) + .put(TableConstraints.NAME, new TableConstraints()) .build(); } diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/CharacterSets.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/CharacterSets.java index 4df41be1b..0a4657eb3 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/CharacterSets.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/CharacterSets.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -25,13 +24,8 @@ public class CharacterSets { public static final String NAME = "character_sets"; - public CharacterSets(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("character_set_catalog", VARCHAR, "null") diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/KeyColumnUsage.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/KeyColumnUsage.java index 5ea74be25..a8ba7182f 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/KeyColumnUsage.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/KeyColumnUsage.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.type.VarcharType.VARCHAR; @@ -24,13 +23,8 @@ public class KeyColumnUsage { public static final String NAME = "key_column_usage"; - public KeyColumnUsage(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return PgCatalogTableUtils.table(NAME) .column("constraint_catalog", VARCHAR) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAmTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAmTable.java index 65f02b764..1d1c7576c 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAmTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAmTable.java @@ -13,7 +13,6 @@ */ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -31,13 +30,8 @@ public class PgAmTable { public static final String NAME = "pg_am"; - public PgAmTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttrdefTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttrdefTable.java index 63f06564d..6117ee278 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttrdefTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttrdefTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -31,13 +30,8 @@ public class PgAttrdefTable { public static final String NAME = "pg_attrdef"; - public PgAttrdefTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttributeTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttributeTable.java index d3f3cc516..186d271fc 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttributeTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgAttributeTable.java @@ -13,7 +13,6 @@ */ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -33,13 +32,8 @@ public class PgAttributeTable { public static final String NAME = "pg_attribute"; - public PgAttributeTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("attrelid", INTEGER, "${hash}(${columnName})") diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTable.java index a43be64c6..52cc047b0 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTable.java @@ -14,23 +14,18 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; -import static java.util.Objects.requireNonNull; - public abstract class PgCatalogTable { protected final TableMetadata tableMetadata; - protected final PgCatalogTableManager pgCatalogTableManager; - public PgCatalogTable(PgCatalogTableManager pgCatalogTableManager) + public PgCatalogTable() { - this.pgCatalogTableManager = requireNonNull(pgCatalogTableManager, "pgCatalogTableManager is null"); - tableMetadata = createMetadata(pgCatalogTableManager); + tableMetadata = createMetadata(); } - protected abstract TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager); + protected abstract TableMetadata createMetadata(); public TableMetadata getTableMetadata() { diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTableUtils.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTableUtils.java index 15cd3f7cb..8e5577da3 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTableUtils.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgCatalogTableUtils.java @@ -24,7 +24,7 @@ public final class PgCatalogTableUtils public static final String PG_CATALOG = "pg_catalog"; public static final String DEFAULT_SCHEMA = "default"; public static final String INFORMATION_SCHEMA = "information_schema"; - public static final String DEFAULT_AUTH = "cannerflow"; + public static final String DEFAULT_AUTH = "cml"; private PgCatalogTableUtils() {} diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgClassTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgClassTable.java index f9a8befc6..d8f099c19 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgClassTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgClassTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import io.cml.type.BooleanType; @@ -33,13 +32,8 @@ public class PgClassTable { public static final String NAME = "pg_class"; - public PgClassTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER, "${hash}(${tableName})") diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgConstraintTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgConstraintTable.java index 51d3d8d47..230e4ce4e 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgConstraintTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgConstraintTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -34,13 +33,8 @@ public class PgConstraintTable { public static final String NAME = "pg_constraint"; - public PgConstraintTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDatabaseTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDatabaseTable.java index 8fe07e33a..22e028d57 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDatabaseTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDatabaseTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.type.BooleanType.BOOLEAN; @@ -30,13 +29,8 @@ public class PgDatabaseTable { public static final String NAME = "pg_database"; - public PgDatabaseTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return PgCatalogTableUtils.table(NAME) .column("oid", INTEGER, "0") diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDescriptionTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDescriptionTable.java index 40fd15a79..c09aac21c 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDescriptionTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgDescriptionTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -31,13 +30,8 @@ public class PgDescriptionTable { public static final String NAME = "pg_description"; - public PgDescriptionTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table("pg_description") .column("objoid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgEnumTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgEnumTable.java index 34ca05999..68a8f978f 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgEnumTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgEnumTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -32,13 +31,8 @@ public class PgEnumTable { public static final String NAME = "pg_enum"; - public PgEnumTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgIndexTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgIndexTable.java index 0b70f156a..2669fa5c0 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgIndexTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgIndexTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -33,13 +32,8 @@ public class PgIndexTable { public static final String NAME = "pg_index"; - public PgIndexTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("indexrelid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgNamespaceTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgNamespaceTable.java index 6f776cd6d..8d44b25c5 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgNamespaceTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgNamespaceTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -30,13 +29,8 @@ public class PgNamespaceTable { public static final String NAME = "pg_namespace"; - public PgNamespaceTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER, "${hash}(${schemaName})") diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgProcTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgProcTable.java index 49001b236..ba6e0a77a 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgProcTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgProcTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -35,15 +34,9 @@ public class PgProcTable extends PgCatalogTable { public static final String NAME = "pg_proc"; - private static final String INTERNAL = "internal"; - - public PgProcTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRangeTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRangeTable.java index db960adfb..660de5dc4 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRangeTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRangeTable.java @@ -13,7 +13,6 @@ */ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -30,13 +29,8 @@ public class PgRangeTable { public static final String NAME = "pg_range"; - public PgRangeTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("rngtypid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRolesTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRolesTable.java index 303b83e23..5f4961d58 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRolesTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgRolesTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.type.BooleanType.BOOLEAN; @@ -33,13 +32,8 @@ public class PgRolesTable { public static final String NAME = "pg_roles"; - public PgRolesTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return PgCatalogTableUtils.table(NAME) .column("rolname", VARCHAR) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgSettingsTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgSettingsTable.java index 1bfc21413..f5b0dabf1 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgSettingsTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgSettingsTable.java @@ -13,7 +13,6 @@ */ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.type.BooleanType.BOOLEAN; @@ -31,13 +30,8 @@ public class PgSettingsTable { public static final String NAME = "pg_settings"; - public PgSettingsTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return PgCatalogTableUtils.table(NAME) .column("name", VARCHAR) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTablespaceTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTablespaceTable.java index a3352bd15..29bdd6e6f 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTablespaceTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTablespaceTable.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -32,13 +31,8 @@ public class PgTablespaceTable { public static final String NAME = "pg_tablespace"; - public PgTablespaceTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTypeTable.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTypeTable.java index acdeaa7a6..cba5328ca 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTypeTable.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/PgTypeTable.java @@ -13,7 +13,6 @@ */ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -31,13 +30,8 @@ public class PgTypeTable { public static final String NAME = "pg_type"; - public PgTypeTable(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("oid", INTEGER) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/ReferentialConstraints.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/ReferentialConstraints.java index 0c58c075d..ff59077b3 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/ReferentialConstraints.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/ReferentialConstraints.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -25,13 +24,8 @@ public class ReferentialConstraints { public static final String NAME = "referential_constraints"; - public ReferentialConstraints(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("constraint_catalog", VARCHAR) diff --git a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/TableConstraints.java b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/TableConstraints.java index c61b905a3..ee0776832 100644 --- a/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/TableConstraints.java +++ b/core/cml-postgres-wire-protocol/src/main/java/io/cml/pgcatalog/table/TableConstraints.java @@ -14,7 +14,6 @@ package io.cml.pgcatalog.table; -import io.cml.pgcatalog.PgCatalogTableManager; import io.cml.spi.metadata.TableMetadata; import static io.cml.pgcatalog.table.PgCatalogTableUtils.table; @@ -25,13 +24,8 @@ public class TableConstraints { public static final String NAME = "table_constraints"; - public TableConstraints(PgCatalogTableManager pgCatalogTableManager) - { - super(pgCatalogTableManager); - } - @Override - protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager) + protected TableMetadata createMetadata() { return table(NAME) .column("constraint_catalog", VARCHAR)