aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-12-31 17:27:34 +0100
committerGitHub <noreply@github.com>2016-12-31 17:27:34 +0100
commit233499b6d6f7df1b2b367ab2e0117021ac1e419b (patch)
treef96c54370f12143cc2f30aad5698d8a5bb11b692
parent89a9ae8925211d850125751547949be3f04d2bbb (diff)
parent8479df482d85b034a5a1e1821f5c75337e114805 (diff)
downloadrails-233499b6d6f7df1b2b367ab2e0117021ac1e419b.tar.gz
rails-233499b6d6f7df1b2b367ab2e0117021ac1e419b.tar.bz2
rails-233499b6d6f7df1b2b367ab2e0117021ac1e419b.zip
Merge pull request #27441 from koic/quoted_insert_version_sql
Add a quote to an SQL insert statement of schema migration
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 2e5af1777c..e5c0e1690c 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -994,15 +994,15 @@ module ActiveRecord
end
def insert_versions_sql(versions) # :nodoc:
- sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+ sm_table = quote_table_name(ActiveRecord::Migrator.schema_migrations_table_name)
if versions.is_a?(Array)
sql = "INSERT INTO #{sm_table} (version) VALUES\n"
- sql << versions.map { |v| "('#{v}')" }.join(",\n")
+ sql << versions.map { |v| "(#{quote(v)})" }.join(",\n")
sql << ";\n\n"
sql
else
- "INSERT INTO #{sm_table} (version) VALUES ('#{versions}');"
+ "INSERT INTO #{sm_table} (version) VALUES (#{quote(versions)});"
end
end
@@ -1032,7 +1032,7 @@ module ActiveRecord
end
unless migrated.include?(version)
- execute "INSERT INTO #{sm_table} (version) VALUES ('#{version}')"
+ execute "INSERT INTO #{sm_table} (version) VALUES (#{quote(version)})"
end
inserting = (versions - migrated).select { |v| v < version }