Skip to content

Commit 533032d

Browse files
committed
clean up after 'jtippett/master' merge
* green tests
1 parent 51d8e6a commit 533032d

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

Diff for: README.rdoc

+1
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,4 @@ Contributors (roughly git log order):
134134
- {Paul Gallagher}[https://github.com/tardate] <[email protected]>
135135
- {James Coleman}[https://github.com/jcoleman] <[email protected]>
136136
- {Aaron Peckham}[https://github.com/apeckham]
137+
- {James Tippett}[https://github.com/jtippett]

Diff for: lib/mysql2psql/config.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ def self.template(options={})
103103
if !options[:suppress_sequence_update].nil?
104104
configtext += <<EOS
105105
106-
# if supress_sequence_update is true, the sequences for serial (auto-incrementing) columns
106+
# if suppress_sequence_update is true, the sequences for serial (auto-incrementing) columns
107107
# will not be update to the current maximum value of that column in the database
108-
# if supress_ddl is not set to true, then this option is implied to be false as well (unless overridden here)
109-
supress_sequence_update: #{options[:suppress_sequence_update]}
108+
# if suppress_ddl is not set to true, then this option is implied to be false as well (unless overridden here)
109+
suppress_sequence_update: #{options[:suppress_sequence_update]}
110110
EOS
111111
end
112112

Diff for: test/fixtures/config_all_options.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ suppress_data: true
3434
# if suppress_ddl is true, only the data will be exported/imported, and not the schema
3535
suppress_ddl: false
3636

37-
# if supress_sequence_update is true, the sequences for serial (auto-incrementing) columns
37+
# if suppress_sequence_update is true, the sequences for serial (auto-incrementing) columns
3838
# will not be update to the current maximum value of that column in the database
39-
# if supress_ddl is not set to true, then this option is implied to be false as well (unless overridden here)
40-
supress_sequence_update: false
39+
# if suppress_ddl is not set to true, then this option is implied to be false as well (unless overridden here)
40+
suppress_sequence_update: false
4141

4242
# if suppress_indexes is true, indexes will not be exported/migrated.
4343
suppress_indexes: false

Diff for: test/integration/convert_to_file_test.rb

-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ def test_should_not_copy_views_as_tables
116116
end
117117

118118
def test_truncate
119-
puts content.inspect
120119
assert_match /TRUNCATE/, content
121120
end
122121
end

Diff for: test/units/config_test.rb

+8-3
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,22 @@ def test_template_option_to_filename
4343
def test_template_option_suppress_data
4444
expected = true
4545
value = Mysql2psql::Config.template({ :suppress_data => expected })
46-
assert_match /supress_data: #{expected}/,value #NB: option spelling needs fixing
46+
assert_match /suppress_data: #{expected}/,value #NB: option spelling needs fixing
4747
end
4848
def test_template_option_suppress_ddl
4949
expected = true
5050
value = Mysql2psql::Config.template({ :suppress_ddl => expected })
51-
assert_match /supress_ddl: #{expected}/,value #NB: option spelling needs fixing
51+
assert_match /suppress_ddl: #{expected}/,value #NB: option spelling needs fixing
5252
end
5353
def test_template_option_suppress_sequence_update
5454
expected = true
5555
value = Mysql2psql::Config.template({ :suppress_sequence_update => expected })
56-
assert_match /supress_sequence_update: #{expected}/,value #NB: option spelling needs fixing
56+
assert_match /suppress_sequence_update: #{expected}/,value #NB: option spelling needs fixing
57+
end
58+
def test_template_option_suppress_indexes
59+
expected = true
60+
value = Mysql2psql::Config.template({ :suppress_indexes => expected })
61+
assert_match /suppress_indexes: #{expected}/,value #NB: option spelling needs fixing
5762
end
5863
def test_template_option_force_truncate
5964
expected = true

0 commit comments

Comments
 (0)