1 files changed, 15 insertions, 0 deletions
diff --git a/lib/gitlab/database/gitlab_schema.rb b/lib/gitlab/database/gitlab_schema.rb
index 38558512b6a..926a4aeedf1 100644
--- a/lib/gitlab/database/gitlab_schema.rb
+++ b/lib/gitlab/database/gitlab_schema.rb
@@ -45,6 +45,11 @@ module Gitlab
           return gitlab_schema
         end
 
+        # Partitions that belong to the CI domain
+        if table_name.start_with?('ci_') && gitlab_schema = views_and_tables_to_schema["p_#{table_name}"]
+          return gitlab_schema
+        end
+
         # All tables from `information_schema.` are marked as `internal`
         return :gitlab_internal if schema_name == 'information_schema'
 
@@ -121,6 +126,16 @@ module Gitlab
 
           key_name = data['table_name'] || data['view_name']
 
+          # rubocop:disable Gitlab/DocUrl
+          if data['gitlab_schema'].nil?
+            raise(
+              UnknownSchemaError,
+              "#{file_path} must specify a valid gitlab_schema for #{key_name}." \
+              "See https://docs.gitlab.com/ee/development/database/database_dictionary.html"
+            )
+          end
+          # rubocop:enable Gitlab/DocUrl
+
           dic[key_name] = data['gitlab_schema'].to_sym
         end
       end