Add latest changes from gitlab-org/gitlab@master

6 files changed, 101 insertions, 26 deletions

diff --git a/lib/gitlab/database/batch_count.rb b/lib/gitlab/database/batch_count.rb
index 7a064fb4005..7249cb3e73b 100644
--- a/lib/gitlab/database/batch_count.rb
+++ b/lib/gitlab/database/batch_count.rb
@@ -27,7 +27,7 @@
 #  batch_sum(User, :sign_in_count)
 #  batch_sum(Issue.group(:state_id), :weight))
 #  batch_average(Ci::Pipeline, :duration)
-#  batch_average(MergeTrain.group(:status), :duration)
+#  batch_average(MergeTrains::Car.group(:status), :duration)
 module Gitlab
   module Database
     module BatchCount
diff --git a/lib/gitlab/database/schema_validation/inconsistency.rb b/lib/gitlab/database/schema_validation/inconsistency.rb
index ea85429364b..c834a6bd693 100644
--- a/lib/gitlab/database/schema_validation/inconsistency.rb
+++ b/lib/gitlab/database/schema_validation/inconsistency.rb
@@ -18,6 +18,10 @@ module Gitlab
           validator_class.name.demodulize.underscore
         end
 
+        def table_name
+          structure_sql_object&.table_name || database_object&.table_name
+        end
+
         def object_name
           structure_sql_object&.name || database_object&.name
         end
diff --git a/lib/gitlab/database/schema_validation/index.rb b/lib/gitlab/database/schema_validation/index.rb
deleted file mode 100644
index af0d5f31f4e..00000000000
--- a/lib/gitlab/database/schema_validation/index.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Database
-    module SchemaValidation
-      class Index
-        def initialize(parsed_stmt)
-          @parsed_stmt = parsed_stmt
-        end
-
-        def name
-          parsed_stmt.idxname
-        end
-
-        def statement
-          @statement ||= PgQuery.deparse_stmt(parsed_stmt)
-        end
-
-        private
-
-        attr_reader :parsed_stmt
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/database/schema_validation/schema_inconsistency.rb b/lib/gitlab/database/schema_validation/schema_inconsistency.rb
new file mode 100644
index 00000000000..6f50603e784
--- /dev/null
+++ b/lib/gitlab/database/schema_validation/schema_inconsistency.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module SchemaValidation
+      class SchemaInconsistency < ApplicationRecord
+        self.table_name = :schema_inconsistencies
+
+        belongs_to :issue
+
+        validates :object_name, :valitador_name, :table_name, presence: true
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/database/schema_validation/schema_objects/base.rb b/lib/gitlab/database/schema_validation/schema_objects/base.rb
index b0c8eb087dd..43d30dc54ae 100644
--- a/lib/gitlab/database/schema_validation/schema_objects/base.rb
+++ b/lib/gitlab/database/schema_validation/schema_objects/base.rb
@@ -13,6 +13,10 @@ module Gitlab
             raise NoMethodError, "subclasses of #{self.class.name} must implement #{__method__}"
           end
 
+          def table_name
+            parsed_stmt.relation.relname
+          end
+
           def statement
             @statement ||= PgQuery.deparse_stmt(parsed_stmt)
           end
diff --git a/lib/gitlab/database/schema_validation/track_inconsistency.rb b/lib/gitlab/database/schema_validation/track_inconsistency.rb
new file mode 100644
index 00000000000..c7e946be647
--- /dev/null
+++ b/lib/gitlab/database/schema_validation/track_inconsistency.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module SchemaValidation
+      class TrackInconsistency
+        def initialize(inconsistency, project, user)
+          @inconsistency = inconsistency
+          @project = project
+          @user = user
+        end
+
+        def execute
+          return unless Gitlab.com?
+          return if inconsistency_record.present?
+
+          result = ::Issues::CreateService.new(container: project, current_user: user, params: params,
+            spam_params: nil).execute
+
+          track_inconsistency(result[:issue]) if result.success?
+        end
+
+        private
+
+        attr_reader :inconsistency, :project, :user
+
+        def track_inconsistency(issue)
+          schema_inconsistency_model.create(
+            issue: issue,
+            object_name: inconsistency.object_name,
+            table_name: inconsistency.table_name,
+            valitador_name: inconsistency.type
+          )
+        end
+
+        def params
+          {
+            title: issue_title,
+            description: issue_description,
+            confidential: true,
+            issue_type: 'issue',
+            labels: %w[database database-inconsistency-report]
+          }
+        end
+
+        def issue_title
+          "New schema inconsistency: #{inconsistency.object_name}"
+        end
+
+        def issue_description
+          <<~MSG
+            We have detected a new schema inconsistency.
+
+            Table_name: #{inconsistency.table_name}
+            Object_name: #{inconsistency.object_name}
+            Validator_name: #{inconsistency.type}
+            Error_message: #{inconsistency.error_message}
+
+            For more information, please contact the database team.
+          MSG
+        end
+
+        def schema_inconsistency_model
+          Gitlab::Database::SchemaValidation::SchemaInconsistency
+        end
+
+        def inconsistency_record
+          schema_inconsistency_model.find_by(
+            object_name: inconsistency.object_name,
+            table_name: inconsistency.table_name,
+            valitador_name: inconsistency.type
+          )
+        end
+      end
+    end
+  end
+end