Skip to content

Commit dcb9cae

Browse files
committed
best to still have ruby 1.8 (syntax) compatibility ... as we're building the jar on 1.6.8
1 parent c344e94 commit dcb9cae

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

lib/arjdbc/mysql/bulk_change_table.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ module BulkChangeTable
99
ChangeColumnDefinition = ActiveRecord::ConnectionAdapters::ChangeColumnDefinition if AR41
1010

1111
# @override
12-
def supports_bulk_alter?
13-
true
14-
end
12+
def supports_bulk_alter?; true end
1513

1614
def bulk_change_table(table_name, operations)
1715
sqls = operations.map do |command, args|
@@ -94,7 +92,7 @@ def rename_column_sql(table_name, column_name, new_column_name)
9492
end unless AR41
9593

9694
def rename_column_sql(table_name, column_name, new_column_name)
97-
options = { name: new_column_name }
95+
options = { :name => new_column_name }
9896

9997
if column = columns(table_name).find { |c| c.name == column_name.to_s }
10098
options[:default] = column.default

test/db/mysql/types_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ def test_binary_types
1010
end
1111

1212
def test_error_handling
13-
assert_raise ActiveRecord::ActiveRecordError { type_to_sql(:binary, 5_000_000_000) }
14-
assert_raise ActiveRecord::ActiveRecordError { type_to_sql(:integer, 10) }
15-
assert_raise ActiveRecord::ActiveRecordError { type_to_sql(:text, 5_000_000_000) }
13+
assert_raise(ActiveRecord::ActiveRecordError) { type_to_sql(:binary, 5_000_000_000) }
14+
assert_raise(ActiveRecord::ActiveRecordError) { type_to_sql(:integer, 10) }
15+
assert_raise(ActiveRecord::ActiveRecordError) { type_to_sql(:text, 5_000_000_000) }
1616
end
1717

1818
def type_to_sql(*args)

0 commit comments

Comments
 (0)