Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/models/audit_event_partitioned_spec.rb b/spec/models/audit_event_partitioned_spec.rb
index fe69f0083b7..ab48e291f78 100644
--- a/spec/models/audit_event_partitioned_spec.rb
+++ b/spec/models/audit_event_partitioned_spec.rb
@@ -7,7 +7,10 @@ RSpec.describe AuditEventPartitioned do
   let(:partitioned_table) { described_class }
 
   it 'has the same columns as the source table' do
-    expect(partitioned_table.column_names).to match_array(source_table.column_names)
+    column_names_from_source_table = column_names(source_table)
+    column_names_from_partioned_table = column_names(partitioned_table)
+
+    expect(column_names_from_partioned_table).to match_array(column_names_from_source_table)
   end
 
   it 'has the same null constraints as the source table' do
@@ -30,6 +33,14 @@ RSpec.describe AuditEventPartitioned do
     expect(event_from_partitioned_table).to eq(event_from_source_table)
   end
 
+  def column_names(table)
+    table.connection.select_all(<<~SQL)
+      SELECT c.column_name
+      FROM information_schema.columns c
+      WHERE c.table_name = '#{table.table_name}'
+    SQL
+  end
+
   def null_constraints(table)
     table.connection.select_all(<<~SQL)
       SELECT c.column_name, c.is_nullable