@@ -11,7 +11,7 @@ def db_config
1111 def do_teardown
1212 drop_rake_test_database ( :silence )
1313 end
14-
14+
1515 test 'rake db:create (and db:drop)' do
1616 begin
1717 Rake ::Task [ "db:create" ] . invoke
@@ -35,13 +35,13 @@ def do_teardown
3535 drop_rake_test_database ( :silence )
3636 Rake ::Task [ "db:drop" ] . invoke
3737 end
38-
38+
3939 test 'rake db:test:purge' do
4040 # Rake::Task["db:create"].invoke
4141 create_rake_test_database do |connection |
4242 connection . create_table ( 'users' ) { |t | t . string :name }
4343 end
44-
44+
4545 Rake ::Task [ "db:test:purge" ] . invoke
4646
4747 ActiveRecord ::Base . establish_connection db_config . merge :database => db_name
@@ -50,27 +50,27 @@ def do_teardown
5050 end
5151
5252 test 'rake db:structure:dump (and db:structure:load)' do
53- omit ( 'smoscript not available' ) unless self . class . find_executable? ( 'smoscript' )
53+ omit ( 'smoscript not available' ) unless self . class . which ( 'smoscript' )
5454 # Rake::Task["db:create"].invoke
5555 create_rake_test_database do |connection |
5656 create_schema_migrations_table ( connection )
5757 connection . create_table ( 'users' ) { |t | t . string :name ; t . timestamps }
5858 end
59-
59+
6060 structure_sql = File . join ( 'db' , structure_sql_filename )
6161 begin
6262 Dir . mkdir 'db' # db/structure.sql
6363 Rake ::Task [ "db:structure:dump" ] . invoke
64-
64+
6565 assert File . exists? ( structure_sql )
6666 # CREATE TABLE [dbo].[users]( ... )
6767 assert_match /CREATE TABLE .*?\[ users\] /i , File . read ( structure_sql )
68-
68+
6969 # db:structure:load
7070 drop_rake_test_database ( :silence )
7171 create_rake_test_database
7272 Rake ::Task [ "db:structure:load" ] . invoke
73-
73+
7474 ActiveRecord ::Base . establish_connection db_config . merge :database => db_name
7575 assert ActiveRecord ::Base . connection . table_exists? ( 'users' )
7676 ActiveRecord ::Base . connection . disconnect!
@@ -79,12 +79,12 @@ def do_teardown
7979 Dir . rmdir 'db'
8080 end
8181 end
82-
82+
8383 setup { rm_r 'db' if File . exist? ( 'db' ) }
84-
84+
8585 test 'rake db:charset' do
8686 create_rake_test_database
87- # using the default character set, the character_set_name should be
87+ # using the default character set, the character_set_name should be
8888 # iso_1 (ISO 8859-1) for the char and varchar data types
8989 expect_rake_output /iso_1|UCS/i
9090 Rake ::Task [ "db:charset" ] . invoke
@@ -96,7 +96,7 @@ def do_teardown
9696 expect_rake_output /SQL_.*/
9797 Rake ::Task [ "db:collation" ] . invoke
9898 end
99-
99+
100100 # @override
101101 def create_rake_test_database ( db_name = self . db_name )
102102 ActiveRecord ::Base . establish_connection db_config
@@ -105,14 +105,14 @@ def create_rake_test_database(db_name = self.db_name)
105105 # connection.use_database('master')
106106 connection . create_database ( db_name , db_config )
107107 end
108-
108+
109109 if block_given?
110110 ActiveRecord ::Base . establish_connection db_config . merge :database => db_name
111111 yield ActiveRecord ::Base . connection
112112 end
113113 ActiveRecord ::Base . connection . disconnect!
114114 end
115-
115+
116116 # @override
117117 def drop_rake_test_database ( silence = false )
118118 ActiveRecord ::Base . establish_connection db_config
@@ -128,9 +128,9 @@ def drop_rake_test_database(silence = false)
128128 end
129129 ActiveRecord ::Base . connection . disconnect!
130130 end
131-
131+
132132 private
133-
133+
134134 def databases
135135 if ActiveRecord ::Base . connection . send ( :sqlserver_2000? )
136136 select = "SELECT name FROM master..sysdatabases ORDER BY name"
@@ -139,5 +139,5 @@ def databases
139139 end
140140 ActiveRecord ::Base . connection . select_rows ( select ) . flatten
141141 end
142-
142+
143143end
0 commit comments