Fix loading a sql structure file on postgres when the file's path has whitespace in it

activerecord/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   Fix a bug where rake db:structure:load crashed when the path contained
+    spaces.
+
+    *Kevin Mook*
+
 *   `ActiveRecord::QueryMethods#unscope` unscopes negative equality
 
     Allows you to call `#unscope` on a relation with negative equality 

activerecord/lib/active_record/tasks/postgresql_database_tasks.rb

@@ -59,7 +59,7 @@ module ActiveRecord
 
       def structure_load(filename)
         set_psql_env
-        Kernel.system("psql -q -f #{filename} #{configuration['database']}")
+        Kernel.system("psql -q -f #{Shellwords.escape(filename)} #{configuration['database']}")
       end
 
       private

activerecord/test/cases/tasks/postgresql_rake_test.rb

@@ -231,6 +231,13 @@ module ActiveRecord
 
       ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
     end
+
+    def test_structure_load_accepts_path_with_spaces
+      filename = "awesome file.sql"
+      Kernel.expects(:system).with("psql -q -f awesome\\ file.sql my-app-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename)
+    end
   end
 
 end