Fix rubocop offenses

parent 81529cc0
...@@ -4,8 +4,8 @@ module Gitlab ...@@ -4,8 +4,8 @@ module Gitlab
def self.perform_checks def self.perform_checks
return '' unless Gitlab::Geo.secondary? return '' unless Gitlab::Geo.secondary?
database_version = self.get_database_version.to_i database_version = self.get_database_version
migration_version = self.get_migration_version.to_i migration_version = self.get_migration_version
if database_version != migration_version if database_version != migration_version
"Current Geo database version (#{database_version}) does not match latest migration (#{migration_version})." "Current Geo database version (#{database_version}) does not match latest migration (#{migration_version})."
...@@ -18,7 +18,7 @@ module Gitlab ...@@ -18,7 +18,7 @@ module Gitlab
def self.db_migrate_path def self.db_migrate_path
# Lazy initialisation so Rails.root will be defined # Lazy initialisation so Rails.root will be defined
@@db_migrate_path ||= File.join(Rails.root, 'db_geo', 'migrate') @db_migrate_path ||= File.join(Rails.root, 'db_geo', 'migrate')
end end
def self.get_database_version def self.get_database_version
...@@ -30,6 +30,7 @@ module Gitlab ...@@ -30,6 +30,7 @@ module Gitlab
connection.execute("SELECT MAX(version) AS version FROM #{schema_migrations_table_name}") connection.execute("SELECT MAX(version) AS version FROM #{schema_migrations_table_name}")
.first .first
.fetch('version') .fetch('version')
.to_i
else else
0 0
end end
...@@ -47,7 +48,7 @@ module Gitlab ...@@ -47,7 +48,7 @@ module Gitlab
end end
end end
latest_migration latest_migration.to_i
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment