Add schema_search_path to test database.yml

rgeo · May 16, 2014 · c98c33d · c98c33d
1 parent 05c553f
commit c98c33d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/test/database.yml b/test/database.yml
@@ -3,3 +3,4 @@ host: 127.0.0.1
 database: postgis_adapter_test
 username: postgres
 setup: default
+schema_search_path: public
diff --git a/test/tasks_test.rb b/test/tasks_test.rb
@@ -35,7 +35,7 @@ def test_empty_sql_dump
               filename = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
               ::FileUtils.rm_f(filename)
               ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
               ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, filename)
               sql = ::File.read(filename)
               assert(sql !~ /CREATE TABLE/)
@@ -45,7 +45,7 @@ def test_basic_geography_sql_dump
               filename = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
               ::FileUtils.rm_f(filename)
               ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
               ::ActiveRecord::Base.connection.create_table(:spatial_test) do |t|
                 t.point "latlon", :geographic => true
               end
@@ -58,7 +58,7 @@ def test_empty_schema_dump
               filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
               ::FileUtils.rm_f(filename)
               ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
               ::File.open(filename, "w:utf-8") do |file|
                 ::ActiveRecord::SchemaDumper.dump(::ActiveRecord::Base.connection, file)
               end
@@ -70,7 +70,7 @@ def test_basic_geometry_schema_dump
               filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
               ::FileUtils.rm_f(filename)
               ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
               conn = ::ActiveRecord::Base.connection
               conn.create_table(:spatial_test) do |t|
                 t.geometry 'object1'
@@ -88,7 +88,7 @@ def test_basic_geography_schema_dump
               filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
               ::FileUtils.rm_f(filename)
               ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
               conn = ::ActiveRecord::Base.connection
               conn.create_table(:spatial_test) do |t|
                 t.point "latlon1", :geographic => true