1 files changed, 57 insertions, 13 deletions

diff --git a/spec/lib/gitlab/database/gitlab_schema_spec.rb b/spec/lib/gitlab/database/gitlab_schema_spec.rb
index 72950895022..4b37cbda047 100644
--- a/spec/lib/gitlab/database/gitlab_schema_spec.rb
+++ b/spec/lib/gitlab/database/gitlab_schema_spec.rb
@@ -1,42 +1,86 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
+RSpec.shared_examples 'validate path globs' do |path_globs|
+  it 'returns an array of path globs' do
+    expect(path_globs).to be_an(Array)
+    expect(path_globs).to all(be_an(Pathname))
+  end
+end
+
 RSpec.describe Gitlab::Database::GitlabSchema do
-  describe '.tables_to_schema' do
-    it 'all tables have assigned a known gitlab_schema' do
-      expect(described_class.tables_to_schema).to all(
+  describe '.views_and_tables_to_schema' do
+    it 'all tables and views have assigned a known gitlab_schema' do
+      expect(described_class.views_and_tables_to_schema).to all(
         match([be_a(String), be_in(Gitlab::Database.schemas_to_base_models.keys.map(&:to_sym))])
       )
     end
 
     # This being run across different databases indirectly also tests
     # a general consistency of structure across databases
-    Gitlab::Database.database_base_models.select { |k, _| k != 'geo' }.each do |db_config_name, db_class|
+    Gitlab::Database.database_base_models.except(:geo).each do |db_config_name, db_class|
       context "for #{db_config_name} using #{db_class}" do
         let(:db_data_sources) { db_class.connection.data_sources }
 
         # The Geo database does not share the same structure as all decomposed databases
-        subject { described_class.tables_to_schema.select { |_, v| v != :gitlab_geo } }
+        subject { described_class.views_and_tables_to_schema.select { |_, v| v != :gitlab_geo } }
 
         it 'new data sources are added' do
-          missing_tables = db_data_sources.to_set - subject.keys
+          missing_data_sources = db_data_sources.to_set - subject.keys
 
-          expect(missing_tables).to be_empty, \
-            "Missing table(s) #{missing_tables.to_a} not found in #{described_class}.tables_to_schema. " \
-            "Any new tables must be added to #{described_class::GITLAB_SCHEMAS_FILE}."
+          expect(missing_data_sources).to be_empty, \
+            "Missing table/view(s) #{missing_data_sources.to_a} not found in " \
+            "#{described_class}.views_and_tables_to_schema. " \
+            "Any new tables or views must be added to the database dictionary. " \
+            "More info: https://docs.gitlab.com/ee/development/database/database_dictionary.html"
         end
 
         it 'non-existing data sources are removed' do
-          extra_tables = subject.keys.to_set - db_data_sources
+          extra_data_sources = subject.keys.to_set - db_data_sources
 
-          expect(extra_tables).to be_empty, \
-            "Extra table(s) #{extra_tables.to_a} found in #{described_class}.tables_to_schema. " \
-            "Any removed or renamed tables must be removed from #{described_class::GITLAB_SCHEMAS_FILE}."
+          expect(extra_data_sources).to be_empty, \
+            "Extra table/view(s) #{extra_data_sources.to_a} found in #{described_class}.views_and_tables_to_schema. " \
+            "Any removed or renamed tables or views must be removed from the database dictionary. " \
+            "More info: https://docs.gitlab.com/ee/development/database/database_dictionary.html"
         end
       end
     end
   end
 
+  describe '.dictionary_path_globs' do
+    include_examples 'validate path globs', described_class.dictionary_path_globs
+  end
+
+  describe '.view_path_globs' do
+    include_examples 'validate path globs', described_class.view_path_globs
+  end
+
+  describe '.tables_to_schema' do
+    let(:database_models) { Gitlab::Database.database_base_models.except(:geo) }
+    let(:views) { database_models.flat_map { |_, m| m.connection.views }.sort.uniq }
+
+    subject { described_class.tables_to_schema }
+
+    it 'returns only tables' do
+      tables = subject.keys
+
+      expect(tables).not_to include(views.to_set)
+    end
+  end
+
+  describe '.views_to_schema' do
+    let(:database_models) { Gitlab::Database.database_base_models.except(:geo) }
+    let(:tables) { database_models.flat_map { |_, m| m.connection.tables }.sort.uniq }
+
+    subject { described_class.views_to_schema }
+
+    it 'returns only views' do
+      views = subject.keys
+
+      expect(views).not_to include(tables.to_set)
+    end
+  end
+
   describe '.table_schema' do
     using RSpec::Parameterized::TableSyntax