diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/character_sets.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/character_sets.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/character_sets.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/character_sets.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/collation_character_set_applicability.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/collation_character_set_applicability.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/collation_character_set_applicability.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/collation_character_set_applicability.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/collations.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/collations.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/collations.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/collations.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/column_privileges.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/column_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/column_privileges.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/column_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/columns.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/columns.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/columns.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/engines.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/engines.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/engines.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/engines.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/events.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/events.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/events.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/events.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/files.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/files.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/files.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/files.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/global_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/global_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/global_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/global_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/global_variables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/global_variables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/global_variables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/global_variables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_buffer_page.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_buffer_page.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_buffer_page.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_buffer_page.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_buffer_page_lru.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_buffer_page_lru.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_buffer_page_lru.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_buffer_page_lru.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_buffer_pool_stats.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_buffer_pool_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_buffer_pool_stats.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_buffer_pool_stats.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index_reset.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index_reset.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index_reset.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp_per_index_reset.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp_reset.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp_reset.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmp_reset.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmp_reset.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmpmem.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmpmem.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmpmem.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmpmem.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmpmem_reset.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmpmem_reset.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_cmpmem_reset.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_cmpmem_reset.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_being_deleted.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_being_deleted.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_being_deleted.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_being_deleted.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_config.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_config.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_config.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_default_stopword.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_default_stopword.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_default_stopword.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_default_stopword.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_deleted.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_deleted.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_deleted.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_deleted.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_index_cache.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_index_cache.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_index_cache.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_index_cache.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_index_table.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_index_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_ft_index_table.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_ft_index_table.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_lock_waits.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_lock_waits.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_lock_waits.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_lock_waits.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_locks.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_locks.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_locks.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_locks.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_metrics.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_metrics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_metrics.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_metrics.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_columns.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_columns.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_columns.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_datafiles.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_datafiles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_datafiles.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_datafiles.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_fields.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_fields.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_fields.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_fields.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign_cols.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign_cols.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign_cols.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_foreign_cols.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_indexes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_indexes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_tables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_tables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_tablespaces.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_tablespaces.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_tablespaces.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_tablespaces.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_tablestats.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_tablestats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_tablestats.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_tablestats.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_virtual.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_virtual.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_sys_virtual.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_sys_virtual.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_temp_table_info.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_temp_table_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_temp_table_info.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_temp_table_info.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/innodb_trx.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_trx.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/innodb_trx.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/innodb_trx.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/key_column_usage.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/key_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/key_column_usage.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/key_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/optimizer_trace.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/optimizer_trace.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/optimizer_trace.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/optimizer_trace.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/parameters.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/parameters.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/parameters.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/parameters.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/partitions.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/partitions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/partitions.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/partitions.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/plugins.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/plugins.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/plugins.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/plugins.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/processlist.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/processlist.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/processlist.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/processlist.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/profiling.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/profiling.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/profiling.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/profiling.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/referential_constraints.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/referential_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/referential_constraints.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/referential_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/routines.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/routines.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/routines.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/routines.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/schema_privileges.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/schema_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/schema_privileges.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/schema_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/schemata.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/schemata.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/schemata.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/schemata.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/session_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/session_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/session_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/session_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/session_variables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/session_variables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/session_variables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/session_variables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/statistics.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/statistics.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/statistics.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/table_constraints.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/table_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/table_constraints.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/table_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/table_privileges.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/table_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/table_privileges.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/table_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/tables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/tables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/tables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/tablespaces.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/tablespaces.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/tablespaces.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/tablespaces.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/triggers.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/triggers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/triggers.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/triggers.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/user_privileges.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/user_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/user_privileges.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/user_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/information_schema/views.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/views.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/information_schema/views.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/information_schema/views.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/columns_priv.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/columns_priv.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/columns_priv.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/columns_priv.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/db.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/db.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/db.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/db.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/engine_cost.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/engine_cost.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/engine_cost.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/engine_cost.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/event.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/event.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/event.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/event.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/func.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/func.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/func.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/func.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/general_log.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/general_log.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/general_log.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/general_log.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/gtid_executed.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/gtid_executed.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/gtid_executed.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/gtid_executed.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/help_category.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_category.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/help_category.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_category.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/help_keyword.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_keyword.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/help_keyword.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_keyword.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/help_relation.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_relation.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/help_relation.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_relation.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/help_topic.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_topic.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/help_topic.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/help_topic.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/innodb_index_stats.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/innodb_index_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/innodb_index_stats.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/innodb_index_stats.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/innodb_table_stats.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/innodb_table_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/innodb_table_stats.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/innodb_table_stats.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/ndb_binlog_index.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/ndb_binlog_index.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/ndb_binlog_index.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/ndb_binlog_index.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/plugin.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/plugin.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/plugin.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/plugin.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/proc.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/proc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/proc.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/proc.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/procs_priv.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/procs_priv.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/procs_priv.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/procs_priv.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/proxies_priv.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/proxies_priv.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/proxies_priv.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/proxies_priv.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/server_cost.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/server_cost.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/server_cost.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/server_cost.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/servers.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/servers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/servers.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/servers.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/slave_master_info.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slave_master_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/slave_master_info.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slave_master_info.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/slave_relay_log_info.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slave_relay_log_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/slave_relay_log_info.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slave_relay_log_info.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/slave_worker_info.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slave_worker_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/slave_worker_info.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slave_worker_info.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/slow_log.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slow_log.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/slow_log.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/slow_log.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/tables_priv.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/tables_priv.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/tables_priv.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/tables_priv.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/time_zone.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/time_zone.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/time_zone_leap_second.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_leap_second.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/time_zone_leap_second.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_leap_second.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/time_zone_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/time_zone_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/time_zone_transition.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_transition.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/time_zone_transition.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_transition.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/time_zone_transition_type.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_transition_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/time_zone_transition_type.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/time_zone_transition_type.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/mysql/user.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/mysql/user.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/mysql/user.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/mysql/user.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/accounts.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/accounts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/accounts.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/accounts.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/cond_instances.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/cond_instances.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/cond_instances.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/cond_instances.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_current.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_current.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_current.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_current.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_history.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_history.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_history.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_history_long.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_history_long.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_history_long.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_history_long.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_account_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_account_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_account_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_account_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_host_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_host_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_host_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_host_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_user_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_user_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_user_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_by_user_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_global_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_global_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_stages_summary_global_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_stages_summary_global_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_current.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_current.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_current.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_current.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_history.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_history.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_history.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_history_long.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_history_long.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_history_long.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_history_long.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_account_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_account_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_account_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_account_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_digest.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_digest.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_digest.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_digest.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_host_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_host_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_host_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_host_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_program.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_program.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_program.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_program.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_user_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_user_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_user_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_by_user_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_global_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_global_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_statements_summary_global_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_statements_summary_global_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_current.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_current.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_current.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_current.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_history.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_history.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_history.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_history_long.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_history_long.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_history_long.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_history_long.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_account_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_account_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_account_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_account_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_host_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_host_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_host_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_host_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_thread_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_thread_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_thread_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_thread_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_user_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_user_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_user_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_by_user_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_global_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_global_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_global_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_transactions_summary_global_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_current.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_current.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_current.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_current.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_history.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_history.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_history.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_history_long.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_history_long.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_history_long.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_history_long.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_account_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_account_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_account_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_account_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_host_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_host_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_host_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_host_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_instance.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_instance.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_instance.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_instance.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_user_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_user_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_user_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_by_user_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_global_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_global_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/events_waits_summary_global_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/events_waits_summary_global_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/file_instances.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/file_instances.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/file_instances.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/file_instances.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/file_summary_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/file_summary_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/file_summary_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/file_summary_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/file_summary_by_instance.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/file_summary_by_instance.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/file_summary_by_instance.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/file_summary_by_instance.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/global_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/global_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/global_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/global_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/global_variables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/global_variables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/global_variables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/global_variables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/host_cache.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/host_cache.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/host_cache.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/host_cache.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/hosts.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/hosts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/hosts.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/hosts.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_account_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_account_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_account_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_account_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_host_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_host_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_host_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_host_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_thread_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_thread_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_thread_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_thread_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_user_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_user_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_by_user_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_by_user_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_global_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_global_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/memory_summary_global_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/memory_summary_global_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/metadata_locks.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/metadata_locks.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/metadata_locks.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/metadata_locks.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/mutex_instances.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/mutex_instances.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/mutex_instances.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/mutex_instances.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/objects_summary_global_by_type.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/objects_summary_global_by_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/objects_summary_global_by_type.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/objects_summary_global_by_type.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/performance_timers.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/performance_timers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/performance_timers.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/performance_timers.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/prepared_statements_instances.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/prepared_statements_instances.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/prepared_statements_instances.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/prepared_statements_instances.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_configuration.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_configuration.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_configuration.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_configuration.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_coordinator.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_coordinator.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_coordinator.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_coordinator.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_worker.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_worker.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_worker.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_applier_status_by_worker.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_connection_configuration.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_connection_configuration.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_connection_configuration.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_connection_configuration.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_connection_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_connection_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_connection_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_connection_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_group_member_stats.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_group_member_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_group_member_stats.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_group_member_stats.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/replication_group_members.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_group_members.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/replication_group_members.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/replication_group_members.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/rwlock_instances.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/rwlock_instances.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/rwlock_instances.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/rwlock_instances.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/session_account_connect_attrs.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_account_connect_attrs.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/session_account_connect_attrs.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_account_connect_attrs.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/session_connect_attrs.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_connect_attrs.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/session_connect_attrs.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_connect_attrs.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/session_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/session_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/session_variables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_variables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/session_variables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/session_variables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/setup_actors.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_actors.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/setup_actors.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_actors.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/setup_consumers.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_consumers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/setup_consumers.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_consumers.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/setup_instruments.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_instruments.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/setup_instruments.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_instruments.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/setup_objects.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_objects.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/setup_objects.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_objects.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/setup_timers.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_timers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/setup_timers.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/setup_timers.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/socket_instances.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/socket_instances.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/socket_instances.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/socket_instances.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/socket_summary_by_event_name.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/socket_summary_by_event_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/socket_summary_by_event_name.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/socket_summary_by_event_name.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/socket_summary_by_instance.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/socket_summary_by_instance.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/socket_summary_by_instance.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/socket_summary_by_instance.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/status_by_account.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_account.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/status_by_account.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_account.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/status_by_host.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_host.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/status_by_host.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_host.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/status_by_thread.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_thread.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/status_by_thread.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_thread.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/status_by_user.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_user.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/status_by_user.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/status_by_user.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/table_handles.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_handles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/table_handles.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_handles.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_index_usage.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_index_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_index_usage.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_index_usage.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_table.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_table.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_io_waits_summary_by_table.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/table_lock_waits_summary_by_table.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_lock_waits_summary_by_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/table_lock_waits_summary_by_table.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/table_lock_waits_summary_by_table.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/threads.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/threads.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/threads.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/threads.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/user_variables_by_thread.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/user_variables_by_thread.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/user_variables_by_thread.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/user_variables_by_thread.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/users.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/users.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/users.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/users.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/performance_schema/variables_by_thread.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/variables_by_thread.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/performance_schema/variables_by_thread.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/performance_schema/variables_by_thread.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/shardingsphere/cluster_information.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/shardingsphere/cluster_information.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/shardingsphere/cluster_information.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/shardingsphere/cluster_information.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/shardingsphere/sharding_table_statistics.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/shardingsphere/sharding_table_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/shardingsphere/sharding_table_statistics.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/shardingsphere/sharding_table_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/host_summary.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/host_summary.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/latest_file_io.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/latest_file_io.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/latest_file_io.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/latest_file_io.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/memory_global_total.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_total.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/memory_global_total.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_total.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/metrics.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/metrics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/metrics.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/metrics.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/processlist.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/processlist.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/processlist.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/processlist.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_object_overview.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/session.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/session.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/session.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/session_ssl_status.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/statement_analysis.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statement_analysis.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/statement_analysis.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/statement_analysis.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/sys-config.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys-config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/sys-config.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys-config.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/sys_config.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/sys_config.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys_config.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/user_summary.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/user_summary.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/version.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/version.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/version.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/version.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
rename to infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_data_wrappers.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_data_wrappers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_data_wrappers.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_data_wrappers.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_servers.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_servers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_servers.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_servers.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_table_columns.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_table_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_table_columns.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_table_columns.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/_pg_foreign_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_foreign_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/_pg_user_mappings.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_user_mappings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/_pg_user_mappings.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/_pg_user_mappings.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/administrable_role_authorizations.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/administrable_role_authorizations.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/administrable_role_authorizations.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/administrable_role_authorizations.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/applicable_roles.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/applicable_roles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/applicable_roles.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/applicable_roles.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/attributes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/attributes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/attributes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/attributes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/character_sets.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/character_sets.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/character_sets.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/character_sets.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/check_constraint_routine_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/check_constraint_routine_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/check_constraint_routine_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/check_constraint_routine_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/check_constraints.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/check_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/check_constraints.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/check_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/collation_character_set_applicability.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/collation_character_set_applicability.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/collation_character_set_applicability.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/collation_character_set_applicability.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/collations.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/collations.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/collations.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/collations.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/column_domain_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_domain_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/column_domain_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_domain_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/column_options.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/column_options.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_options.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/column_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/column_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/column_udt_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_udt_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/column_udt_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/column_udt_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/columns.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/columns.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/columns.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/constraint_column_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/constraint_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/constraint_column_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/constraint_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/constraint_table_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/constraint_table_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/constraint_table_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/constraint_table_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/data_type_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/data_type_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/data_type_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/data_type_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/domain_constraints.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/domain_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/domain_constraints.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/domain_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/domain_udt_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/domain_udt_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/domain_udt_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/domain_udt_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/domains.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/domains.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/domains.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/domains.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/element_types.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/element_types.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/element_types.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/element_types.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/enabled_roles.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/enabled_roles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/enabled_roles.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/enabled_roles.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/foreign_data_wrapper_options.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_data_wrapper_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/foreign_data_wrapper_options.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_data_wrapper_options.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/foreign_data_wrappers.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_data_wrappers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/foreign_data_wrappers.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_data_wrappers.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/foreign_server_options.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_server_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/foreign_server_options.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_server_options.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/foreign_servers.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_servers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/foreign_servers.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_servers.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/foreign_table_options.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_table_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/foreign_table_options.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_table_options.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/foreign_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/foreign_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/foreign_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/information_schema_catalog_name.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/information_schema_catalog_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/information_schema_catalog_name.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/information_schema_catalog_name.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/key_column_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/key_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/key_column_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/key_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/parameters.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/parameters.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/parameters.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/parameters.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/referential_constraints.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/referential_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/referential_constraints.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/referential_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/role_column_grants.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_column_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/role_column_grants.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_column_grants.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/role_routine_grants.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_routine_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/role_routine_grants.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_routine_grants.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/role_table_grants.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_table_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/role_table_grants.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_table_grants.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/role_udt_grants.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_udt_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/role_udt_grants.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_udt_grants.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/role_usage_grants.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_usage_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/role_usage_grants.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/role_usage_grants.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/routine_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/routine_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/routine_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/routine_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/routines.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/routines.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/routines.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/routines.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/schemata.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/schemata.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/schemata.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/schemata.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sequences.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sequences.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sequences.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_features.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_features.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_features.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_features.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_implementation_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_implementation_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_implementation_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_implementation_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_languages.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_languages.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_languages.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_languages.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_packages.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_packages.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_packages.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_packages.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_parts.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_parts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_parts.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_parts.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_sizing.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_sizing.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_sizing.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_sizing.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/sql_sizing_profiles.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_sizing_profiles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/sql_sizing_profiles.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/sql_sizing_profiles.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/table_constraints.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/table_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/table_constraints.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/table_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/table_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/table_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/table_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/table_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/triggered_update_columns.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/triggered_update_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/triggered_update_columns.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/triggered_update_columns.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/triggers.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/triggers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/triggers.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/triggers.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/udt_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/udt_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/udt_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/udt_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/usage_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/usage_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/usage_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/usage_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/user_defined_types.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/user_defined_types.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/user_defined_types.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/user_defined_types.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/user_mapping_options.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/user_mapping_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/user_mapping_options.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/user_mapping_options.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/user_mappings.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/user_mappings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/user_mappings.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/user_mappings.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/view_column_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/view_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/view_column_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/view_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/view_routine_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/view_routine_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/view_routine_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/view_routine_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/view_table_usage.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/view_table_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/view_table_usage.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/view_table_usage.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/information_schema/views.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/views.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/information_schema/views.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/information_schema/views.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/get_global_prepared_xacts.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/get_global_prepared_xacts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/get_global_prepared_xacts.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/get_global_prepared_xacts.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_all_control_group_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_all_control_group_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_all_control_group_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_all_control_group_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_asp.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_asp.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_asp.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_asp.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_access.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_access.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_access.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_access.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_access.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_access.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_access.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_access.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_filters.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_filters.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_filters.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_filters.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_policy_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_privilege.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_privilege.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_privilege.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_auditing_privilege.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys_args.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys_args.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys_args.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_client_global_keys_args.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_cluster_resource_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_cluster_resource_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_cluster_resource_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_cluster_resource_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys_args.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys_args.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys_args.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_column_keys_args.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_comm_proxy_thread_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_comm_proxy_thread_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_comm_proxy_thread_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_comm_proxy_thread_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_db_privilege.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_db_privilege.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_db_privilege.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_db_privilege.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_db_privileges.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_db_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_db_privileges.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_db_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_columns.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_columns.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_columns.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_proc.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_proc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_proc.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_encrypted_proc.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_file_stat.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_file_stat.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_file_stat.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_file_stat.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_get_control_group_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_get_control_group_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_get_control_group_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_get_control_group_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_global_chain.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_global_chain.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_global_chain.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_global_chain.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_global_config.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_global_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_global_config.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_global_config.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_gsc_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_gsc_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_gsc_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_gsc_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_instance_time.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_instance_time.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_instance_time.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_instance_time.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_job_argument.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_job_argument.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_job_argument.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_job_argument.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_job_attribute.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_job_attribute.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_job_attribute.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_job_attribute.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_labels.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_labels.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_labels.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_labels.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_lsc_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_lsc_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_lsc_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_lsc_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_actions.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_actions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_actions.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_actions.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_filters.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_filters.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_filters.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_masking_policy_filters.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_matview.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_matview.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_matview.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_matview.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_matview_dependency.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_matview_dependency.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_matview_dependency.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_matview_dependency.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_matviews.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_matviews.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_matviews.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_matviews.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_model_warehouse.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_model_warehouse.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_model_warehouse.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_model_warehouse.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_obsscaninfo.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_obsscaninfo.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_obsscaninfo.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_obsscaninfo.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_opt_model.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_opt_model.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_opt_model.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_opt_model.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_os_run_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_os_run_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_os_run_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_os_run_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_package.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_package.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_package.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_package.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_policy_label.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_policy_label.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_policy_label.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_policy_label.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_recyclebin.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_recyclebin.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_recyclebin.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_recyclebin.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_redo_stat.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_redo_stat.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_redo_stat.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_redo_stat.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_cpu_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_cpu_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_cpu_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_cpu_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_context.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_context.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_context.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_context.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_memory_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_stat.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_stat.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_stat.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_stat.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_time.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_time.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_session_time.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_session_time.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_shared_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_shared_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_shared_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_shared_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_sql_count.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_sql_count.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_sql_count.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_sql_count.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_stat_session_cu.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_stat_session_cu.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_stat_session_cu.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_stat_session_cu.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_thread_memory_context.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_thread_memory_context.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_thread_memory_context.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_thread_memory_context.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_total_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_total_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_total_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_total_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_total_nodegroup_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_total_nodegroup_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_total_nodegroup_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_total_nodegroup_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_txn_snapshot.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_txn_snapshot.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_txn_snapshot.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_txn_snapshot.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_uid.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_uid.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_uid.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_uid.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_cgroup_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_cgroup_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_cgroup_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_cgroup_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_ec_operator_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_instance_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_instance_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_instance_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_instance_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_operator_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_encoding_table.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_encoding_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_encoding_table.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_encoding_table.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_plan_operator_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_rebuild_user_resource_pool.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_rebuild_user_resource_pool.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_rebuild_user_resource_pool.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_rebuild_user_resource_pool.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_resource_pool.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_resource_pool.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_resource_pool.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_resource_pool.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info_all.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info_all.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info_all.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_info_all.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_query_info_all.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_query_info_all.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_query_info_all.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_query_info_all.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_session_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_resource_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_resource_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_resource_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_user_resource_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_workload_records.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_workload_records.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_workload_records.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/gs_wlm_workload_records.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/mpp_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/mpp_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/mpp_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/mpp_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_aggregate.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_aggregate.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_aggregate.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_aggregate.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_am.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_am.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_am.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_am.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_amop.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_amop.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_amop.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_amop.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_amproc.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_amproc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_amproc.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_amproc.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_app_workloadgroup_mapping.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_app_workloadgroup_mapping.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_app_workloadgroup_mapping.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_app_workloadgroup_mapping.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_attrdef.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_attrdef.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_attrdef.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_attrdef.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_attribute.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_attribute.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_attribute.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_attribute.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_auth_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_auth_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_auth_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_auth_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_auth_members.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_auth_members.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_auth_members.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_auth_members.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_authid.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_authid.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_authid.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_authid.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_available_extension_versions.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_available_extension_versions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_available_extension_versions.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_available_extension_versions.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_available_extensions.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_available_extensions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_available_extensions.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_available_extensions.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_cast.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_cast.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_cast.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_cast.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_class.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_class.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_class.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_class.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_collation.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_collation.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_collation.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_collation.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_delay.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_delay.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_delay.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_delay.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_recv_stream.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_recv_stream.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_recv_stream.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_recv_stream.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_send_stream.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_send_stream.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_send_stream.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_send_stream.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_comm_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_comm_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_constraint.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_constraint.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_constraint.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_constraint.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_control_group_config.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_control_group_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_control_group_config.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_control_group_config.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_conversion.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_conversion.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_conversion.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_conversion.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_cursors.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_cursors.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_cursors.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_cursors.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_database.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_database.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_database.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_database.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_db_role_setting.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_db_role_setting.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_db_role_setting.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_db_role_setting.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_default_acl.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_default_acl.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_default_acl.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_default_acl.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_depend.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_depend.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_depend.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_depend.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_description.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_description.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_description.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_description.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_directory.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_directory.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_directory.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_directory.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_enum.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_enum.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_enum.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_enum.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ext_stats.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ext_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ext_stats.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ext_stats.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_extension.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_extension.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_extension.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_extension.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_extension_data_source.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_extension_data_source.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_extension_data_source.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_extension_data_source.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_data_wrapper.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_data_wrapper.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_data_wrapper.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_data_wrapper.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_server.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_server.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_server.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_server.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_table.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_table.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_foreign_table.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_get_invalid_backends.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_get_invalid_backends.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_get_invalid_backends.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_get_invalid_backends.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_get_senders_catchup_time.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_get_senders_catchup_time.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_get_senders_catchup_time.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_get_senders_catchup_time.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_group.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_group.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_group.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_group.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_attached_pids.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_attached_pids.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_attached_pids.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_attached_pids.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_relstats.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_relstats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_relstats.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_relstats.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_stats.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_stats.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_gtt_stats.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_hashbucket.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_hashbucket.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_hashbucket.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_hashbucket.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_index.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_index.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_index.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_index.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_inherits.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_inherits.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_inherits.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_inherits.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_job.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_job.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_job.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_job.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_job_proc.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_job_proc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_job_proc.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_job_proc.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_language.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_language.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_language.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_language.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject_metadata.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject_metadata.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject_metadata.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_largeobject_metadata.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_locks.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_locks.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_locks.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_locks.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_namespace.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_namespace.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_namespace.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_namespace.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_node_env.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_node_env.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_node_env.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_node_env.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_object.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_object.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_object.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_object.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_obsscaninfo.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_obsscaninfo.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_obsscaninfo.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_obsscaninfo.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_opclass.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_opclass.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_opclass.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_opclass.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_operator.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_operator.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_operator.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_operator.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_opfamily.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_opfamily.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_opfamily.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_opfamily.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_os_threads.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_os_threads.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_os_threads.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_os_threads.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_partition.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_partition.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_partition.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_partition.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_pltemplate.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_pltemplate.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_pltemplate.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_pltemplate.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_statements.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_statements.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_statements.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_statements.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_xacts.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_xacts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_xacts.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_prepared_xacts.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_proc.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_proc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_proc.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_proc.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_publication.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_publication.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_publication.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_publication.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_publication_rel.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_publication_rel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_publication_rel.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_publication_rel.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_publication_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_publication_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_publication_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_publication_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_range.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_range.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_range.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_range.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_replication_origin_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_replication_slots.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_replication_slots.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_replication_slots.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_replication_slots.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_resource_pool.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_resource_pool.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_resource_pool.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_resource_pool.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rewrite.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rewrite.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rewrite.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rewrite.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicies.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicies.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicies.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicies.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicy.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicy.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicy.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rlspolicy.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_roles.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_roles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_roles.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_roles.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rules.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rules.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_rules.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_rules.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_running_xacts.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_running_xacts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_running_xacts.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_running_xacts.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_seclabel.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_seclabel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_seclabel.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_seclabel.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_seclabels.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_seclabels.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_seclabels.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_seclabels.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_session_iostat.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_session_iostat.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_session_iostat.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_session_iostat.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_session_wlmstat.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_session_wlmstat.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_session_wlmstat.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_session_wlmstat.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_settings.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_settings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_settings.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_settings.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shadow.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shadow.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shadow.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shadow.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shdepend.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shdepend.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shdepend.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shdepend.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shdescription.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shdescription.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shdescription.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shdescription.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shseclabel.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shseclabel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_shseclabel.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_shseclabel.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity_ng.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity_ng.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity_ng.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_activity_ng.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_all_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bad_block.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bad_block.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bad_block.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bad_block.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bgwriter.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bgwriter.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bgwriter.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_bgwriter.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database_conflicts.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database_conflicts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database_conflicts.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_database_conflicts.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_replication.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_replication.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_replication.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_replication.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_subscription.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_subscription.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_subscription.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_subscription.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_functions.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_functions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_functions.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_functions.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_user_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_all_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_all_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_all_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_all_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_sys_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_sys_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_functions.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_functions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_functions.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_functions.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stat_xact_user_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_sequences.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_sequences.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_all_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_sequences.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_sequences.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_indexes.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_indexes.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_sequences.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_sequences.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statio_user_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statistic.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statistic.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statistic.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statistic.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statistic_ext.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statistic_ext.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_statistic_ext.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_statistic_ext.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stats.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_stats.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_stats.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_subscription.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_subscription.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_subscription.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_subscription.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_synonym.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_synonym.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_synonym.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_synonym.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_tables.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_tables.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_tables.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_tablespace.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_tablespace.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_tablespace.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_tablespace.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_tde_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_tde_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_tde_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_tde_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_thread_wait_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_thread_wait_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_thread_wait_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_thread_wait_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_abbrevs.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_abbrevs.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_abbrevs.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_abbrevs.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_names.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_names.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_names.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_timezone_names.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_total_memory_detail.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_total_memory_detail.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_total_memory_detail.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_total_memory_detail.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info_oid.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info_oid.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info_oid.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_total_user_resource_info_oid.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_trigger.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_trigger.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_trigger.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_trigger.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config_map.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config_map.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config_map.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_config_map.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_dict.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_dict.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_dict.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_dict.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_parser.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_parser.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_parser.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_parser.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_template.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_template.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_ts_template.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_ts_template.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_type.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_type.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_type.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user_mapping.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user_mapping.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user_mapping.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user_mapping.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user_mappings.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user_mappings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user_mappings.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user_mappings.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_user_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_user_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_variable_info.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_variable_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_variable_info.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_variable_info.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_views.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_views.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_views.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_views.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_wlm_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_wlm_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_wlm_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_wlm_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_workload_group.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_workload_group.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pg_workload_group.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pg_workload_group.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_class.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_class.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_class.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_class.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_group.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_group.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_group.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_group.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_node.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_node.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_node.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_node.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_prepared_xacts.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_prepared_xacts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_prepared_xacts.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_prepared_xacts.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_slice.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_slice.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_slice.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_slice.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_thread_wait_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_thread_wait_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/pgxc_thread_wait_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/pgxc_thread_wait_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/plan_table.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/plan_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/plan_table.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/plan_table.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/plan_table_data.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/plan_table_data.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/plan_table_data.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/plan_table_data.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/statement_history.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/statement_history.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/statement_history.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/statement_history.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/streaming_cont_query.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/streaming_cont_query.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/streaming_cont_query.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/streaming_cont_query.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/streaming_reaper_status.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/streaming_reaper_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/streaming_reaper_status.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/streaming_reaper_status.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/streaming_stream.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/streaming_stream.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/streaming_stream.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/streaming_stream.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/pg_catalog/sys_dummy.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/sys_dummy.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/pg_catalog/sys_dummy.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/pg_catalog/sys_dummy.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/shardingsphere/cluster_information.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/shardingsphere/cluster_information.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/shardingsphere/cluster_information.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/shardingsphere/cluster_information.yaml
diff --git a/infra/common/src/main/resources/schema/opengauss/shardingsphere/sharding_table_statistics.yaml b/infra/database/type/opengauss/src/main/resources/schema/opengauss/shardingsphere/sharding_table_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/opengauss/shardingsphere/sharding_table_statistics.yaml
rename to infra/database/type/opengauss/src/main/resources/schema/opengauss/shardingsphere/sharding_table_statistics.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_data_wrappers.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_data_wrappers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_data_wrappers.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_data_wrappers.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_servers.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_servers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_servers.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_servers.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_table_columns.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_table_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_table_columns.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_table_columns.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/_pg_foreign_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_foreign_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/_pg_user_mappings.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_user_mappings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/_pg_user_mappings.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/_pg_user_mappings.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/administrable_role_authorizations.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/administrable_role_authorizations.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/administrable_role_authorizations.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/administrable_role_authorizations.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/applicable_roles.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/applicable_roles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/applicable_roles.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/applicable_roles.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/attributes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/attributes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/attributes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/attributes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/character_sets.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/character_sets.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/character_sets.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/character_sets.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/check_constraint_routine_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/check_constraint_routine_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/check_constraint_routine_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/check_constraint_routine_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/check_constraints.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/check_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/check_constraints.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/check_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/collation_character_set_applicability.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/collation_character_set_applicability.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/collation_character_set_applicability.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/collation_character_set_applicability.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/collations.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/collations.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/collations.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/collations.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/column_column_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/column_column_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/column_domain_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_domain_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/column_domain_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_domain_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/column_options.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/column_options.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_options.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/column_privileges.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/column_privileges.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/column_udt_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_udt_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/column_udt_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/column_udt_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/columns.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/columns.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/columns.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/constraint_column_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/constraint_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/constraint_column_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/constraint_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/constraint_table_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/constraint_table_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/constraint_table_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/constraint_table_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/data_type_privileges.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/data_type_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/data_type_privileges.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/data_type_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/domain_constraints.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/domain_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/domain_constraints.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/domain_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/domain_udt_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/domain_udt_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/domain_udt_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/domain_udt_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/domains.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/domains.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/domains.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/domains.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/element_types.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/element_types.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/element_types.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/element_types.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/enabled_roles.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/enabled_roles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/enabled_roles.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/enabled_roles.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/foreign_data_wrapper_options.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_data_wrapper_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/foreign_data_wrapper_options.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_data_wrapper_options.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/foreign_data_wrappers.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_data_wrappers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/foreign_data_wrappers.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_data_wrappers.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/foreign_server_options.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_server_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/foreign_server_options.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_server_options.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/foreign_servers.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_servers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/foreign_servers.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_servers.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/foreign_table_options.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_table_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/foreign_table_options.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_table_options.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/foreign_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/foreign_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/foreign_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/information_schema_catalog_name.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/information_schema_catalog_name.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/information_schema_catalog_name.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/information_schema_catalog_name.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/key_column_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/key_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/key_column_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/key_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/parameters.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/parameters.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/parameters.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/parameters.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/referential_constraints.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/referential_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/referential_constraints.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/referential_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/role_column_grants.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_column_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/role_column_grants.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_column_grants.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/role_routine_grants.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_routine_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/role_routine_grants.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_routine_grants.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/role_table_grants.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_table_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/role_table_grants.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_table_grants.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/role_udt_grants.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_udt_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/role_udt_grants.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_udt_grants.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/role_usage_grants.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_usage_grants.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/role_usage_grants.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/role_usage_grants.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/routine_column_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/routine_column_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/routine_privileges.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/routine_privileges.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/routine_routine_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_routine_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/routine_routine_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_routine_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/routine_sequence_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_sequence_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/routine_sequence_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_sequence_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/routine_table_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_table_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/routine_table_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routine_table_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/routines.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routines.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/routines.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/routines.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/schemata.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/schemata.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/schemata.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/schemata.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/sequences.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/sequences.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sequences.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/sql_features.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_features.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/sql_features.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_features.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/sql_implementation_info.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_implementation_info.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/sql_implementation_info.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_implementation_info.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/sql_parts.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_parts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/sql_parts.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_parts.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/sql_sizing.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_sizing.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/sql_sizing.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/sql_sizing.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/table_constraints.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/table_constraints.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/table_constraints.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/table_constraints.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/table_privileges.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/table_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/table_privileges.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/table_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/transforms.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/transforms.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/transforms.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/transforms.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/triggered_update_columns.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/triggered_update_columns.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/triggered_update_columns.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/triggered_update_columns.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/triggers.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/triggers.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/triggers.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/triggers.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/udt_privileges.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/udt_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/udt_privileges.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/udt_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/usage_privileges.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/usage_privileges.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/usage_privileges.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/usage_privileges.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/user_defined_types.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/user_defined_types.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/user_defined_types.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/user_defined_types.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/user_mapping_options.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/user_mapping_options.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/user_mapping_options.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/user_mapping_options.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/user_mappings.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/user_mappings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/user_mappings.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/user_mappings.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/view_column_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/view_column_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/view_column_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/view_column_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/view_routine_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/view_routine_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/view_routine_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/view_routine_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/view_table_usage.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/view_table_usage.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/view_table_usage.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/view_table_usage.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/information_schema/views.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/views.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/information_schema/views.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/information_schema/views.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_aggregate.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_aggregate.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_aggregate.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_aggregate.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_am.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_am.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_am.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_am.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_amop.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_amop.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_amop.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_amop.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_amproc.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_amproc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_amproc.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_amproc.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_attrdef.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_attrdef.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_attrdef.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_attrdef.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_attribute.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_attribute.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_attribute.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_attribute.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_auth_members.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_auth_members.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_auth_members.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_auth_members.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_authid.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_authid.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_authid.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_authid.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_available_extension_versions.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_available_extension_versions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_available_extension_versions.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_available_extension_versions.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_available_extensions.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_available_extensions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_available_extensions.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_available_extensions.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_backend_memory_contexts.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_backend_memory_contexts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_backend_memory_contexts.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_backend_memory_contexts.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_cast.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_cast.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_cast.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_cast.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_class.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_class.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_class.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_class.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_collation.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_collation.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_collation.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_collation.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_config.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_config.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_config.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_constraint.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_constraint.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_constraint.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_constraint.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_conversion.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_conversion.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_conversion.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_conversion.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_cursors.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_cursors.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_cursors.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_cursors.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_database.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_database.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_database.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_database.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_db_role_setting.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_db_role_setting.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_db_role_setting.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_db_role_setting.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_default_acl.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_default_acl.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_default_acl.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_default_acl.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_depend.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_depend.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_depend.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_depend.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_description.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_description.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_description.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_description.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_enum.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_enum.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_enum.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_enum.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_event_trigger.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_event_trigger.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_event_trigger.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_event_trigger.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_extension.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_extension.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_extension.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_extension.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_file_settings.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_file_settings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_file_settings.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_file_settings.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_data_wrapper.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_data_wrapper.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_data_wrapper.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_data_wrapper.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_server.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_server.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_server.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_server.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_table.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_table.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_foreign_table.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_group.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_group.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_group.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_group.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_hba_file_rules.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_hba_file_rules.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_hba_file_rules.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_hba_file_rules.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_index.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_index.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_index.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_index.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_inherits.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_inherits.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_inherits.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_inherits.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_init_privs.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_init_privs.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_init_privs.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_init_privs.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_language.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_language.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_language.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_language.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject_metadata.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject_metadata.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject_metadata.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_largeobject_metadata.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_locks.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_locks.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_locks.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_locks.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_matviews.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_matviews.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_matviews.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_matviews.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_namespace.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_namespace.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_namespace.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_namespace.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_opclass.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_opclass.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_opclass.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_opclass.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_operator.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_operator.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_operator.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_operator.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_opfamily.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_opfamily.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_opfamily.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_opfamily.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_partitioned_table.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_partitioned_table.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_partitioned_table.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_partitioned_table.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_policies.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_policies.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_policies.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_policies.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_policy.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_policy.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_policy.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_policy.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_statements.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_statements.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_statements.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_statements.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_xacts.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_xacts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_xacts.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_prepared_xacts.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_proc.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_proc.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_proc.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_proc.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_publication.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_publication.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_publication.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_publication.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_publication_rel.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_publication_rel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_publication_rel.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_publication_rel.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_publication_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_publication_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_publication_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_publication_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_range.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_range.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_range.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_range.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin_status.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin_status.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin_status.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_replication_origin_status.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_replication_slots.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_replication_slots.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_replication_slots.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_replication_slots.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_rewrite.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_rewrite.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_rewrite.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_rewrite.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_roles.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_roles.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_roles.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_roles.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_rules.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_rules.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_rules.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_rules.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_seclabel.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_seclabel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_seclabel.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_seclabel.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_seclabels.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_seclabels.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_seclabels.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_seclabels.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_sequence.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_sequence.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_sequence.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_sequence.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_sequences.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_sequences.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_settings.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_settings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_settings.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_settings.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shadow.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shadow.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shadow.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shadow.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shdepend.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shdepend.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shdepend.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shdepend.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shdescription.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shdescription.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shdescription.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shdescription.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shmem_allocations.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shmem_allocations.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shmem_allocations.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shmem_allocations.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shseclabel.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shseclabel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_shseclabel.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_shseclabel.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_activity.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_activity.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_activity.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_activity.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_all_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_archiver.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_archiver.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_archiver.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_archiver.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_bgwriter.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_bgwriter.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_bgwriter.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_bgwriter.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_copy.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_copy.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_copy.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_copy.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_create_index.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_create_index.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_create_index.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_create_index.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_vacuum.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_vacuum.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_vacuum.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_vacuum.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication_slots.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication_slots.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication_slots.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_replication_slots.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_slru.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_slru.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_slru.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_slru.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_ssl.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_ssl.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_ssl.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_ssl.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_subscription.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_subscription.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_subscription.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_subscription.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_functions.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_functions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_functions.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_functions.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_user_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal_receiver.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal_receiver.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal_receiver.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_wal_receiver.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_all_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_all_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_all_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_all_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_sys_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_sys_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_functions.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_functions.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_functions.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_functions.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stat_xact_user_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_sequences.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_sequences.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_all_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_sequences.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_sequences.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_sys_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_indexes.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_indexes.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_indexes.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_indexes.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_sequences.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_sequences.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_sequences.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_sequences.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statio_user_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statistic.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statistic.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statistic.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statistic.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext_data.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext_data.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext_data.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_statistic_ext_data.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stats.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stats.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stats.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stats.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext_exprs.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext_exprs.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext_exprs.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_stats_ext_exprs.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_subscription.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_subscription.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_subscription.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_subscription.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_subscription_rel.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_subscription_rel.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_subscription_rel.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_subscription_rel.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_tables.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_tables.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_tables.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_tables.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_tablespace.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_tablespace.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_tablespace.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_tablespace.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_abbrevs.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_abbrevs.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_abbrevs.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_abbrevs.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_names.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_names.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_names.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_timezone_names.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_transform.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_transform.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_transform.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_transform.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_trigger.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_trigger.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_trigger.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_trigger.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config_map.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config_map.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config_map.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_config_map.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_dict.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_dict.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_dict.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_dict.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_parser.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_parser.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_parser.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_parser.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_template.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_template.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_ts_template.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_ts_template.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_type.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_type.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_type.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_type.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_user.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_user.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_user.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_user.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_user_mapping.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_user_mapping.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_user_mapping.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_user_mapping.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_user_mappings.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_user_mappings.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_user_mappings.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_user_mappings.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_views.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_views.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_views.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/pg_catalog/pg_views.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/shardingsphere/cluster_information.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/shardingsphere/cluster_information.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/shardingsphere/cluster_information.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/shardingsphere/cluster_information.yaml
diff --git a/infra/common/src/main/resources/schema/postgresql/shardingsphere/sharding_table_statistics.yaml b/infra/database/type/postgresql/src/main/resources/schema/postgresql/shardingsphere/sharding_table_statistics.yaml
similarity index 100%
rename from infra/common/src/main/resources/schema/postgresql/shardingsphere/sharding_table_statistics.yaml
rename to infra/database/type/postgresql/src/main/resources/schema/postgresql/shardingsphere/sharding_table_statistics.yaml