diff --git a/db/migrate/20180428200509_add_index_to_ci_builds_artifacts_file.rb b/db/migrate/20180428200509_add_index_to_ci_builds_artifacts_file.rb
index fd36f68af0bfdc4818a490a21c6a68ed02c56216..917df970b0c58871b2dd34c0ce761d71f75df78c 100644
--- a/db/migrate/20180428200509_add_index_to_ci_builds_artifacts_file.rb
+++ b/db/migrate/20180428200509_add_index_to_ci_builds_artifacts_file.rb
@@ -6,10 +6,12 @@ class AddIndexToCiBuildsArtifactsFile < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
+    return unless Gitlab::Database.postgresql?
+
     # We add an temporary index to `ci_builds.artifacts_file` column to avoid statements timeout in legacy artifacts migrations
     # This index is to be removed after we have cleaned up background migrations
     # https://gitlab.com/gitlab-org/gitlab-ce/issues/46866
-    add_concurrent_index :ci_builds, :artifacts_file, where: "artifacts_file <> ''", length: 20
+    add_concurrent_index :ci_builds, :artifacts_file, where: "artifacts_file <> ''"
   end
 
   def down
diff --git a/db/schema.rb b/db/schema.rb
index dd492fde9aacc1769d2839f9d325ec27d27642a6..9ac9afa638fd808a25c5e95bf8b608bc27de79e4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -331,7 +331,7 @@ ActiveRecord::Schema.define(version: 20180603190921) do
   end
 
   add_index "ci_builds", ["artifacts_expire_at"], name: "index_ci_builds_on_artifacts_expire_at", where: "(artifacts_file <> ''::text)", using: :btree
-  add_index "ci_builds", ["artifacts_file"], name: "index_ci_builds_on_artifacts_file", where: "(artifacts_file <> ''::text)", length: 20, using: :btree
+  add_index "ci_builds", ["artifacts_file"], name: "index_ci_builds_on_artifacts_file", where: "(artifacts_file <> ''::text)", using: :btree
   add_index "ci_builds", ["auto_canceled_by_id"], name: "index_ci_builds_on_auto_canceled_by_id", using: :btree
   add_index "ci_builds", ["commit_id", "stage_idx", "created_at"], name: "index_ci_builds_on_commit_id_and_stage_idx_and_created_at", using: :btree
   add_index "ci_builds", ["commit_id", "status", "type"], name: "index_ci_builds_on_commit_id_and_status_and_type", using: :btree
@@ -1727,6 +1727,7 @@ ActiveRecord::Schema.define(version: 20180603190921) do
   end
 
   add_index "redirect_routes", ["path"], name: "index_redirect_routes_on_path", unique: true, using: :btree
+  add_index "redirect_routes", ["path"], name: "index_redirect_routes_on_path_text_pattern_ops", using: :btree, opclasses: {"path"=>"varchar_pattern_ops"}
   add_index "redirect_routes", ["source_type", "source_id"], name: "index_redirect_routes_on_source_type_and_source_id", using: :btree
 
   create_table "releases", force: :cascade do |t|