Skip to content

Commit 28ebca7

Browse files
committed
Default value detection in column_definitions is kinder to badly formatted, or long winded user defined functions, for default values. Resolves ticket #8
1 parent f994f7d commit 28ebca7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11

22
MASTER
33

4+
* Default value detection in column_definitions is kinder to badly formatted, or long winded user
5+
defined functions, for default values. Resolves ticket #8 [Ken Collins]
6+
47
* Make sure bigint SQL Server data type can be used and converted back to Bignum as expected. [Ken Collins]
58

69

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,8 @@ def column_definitions(table_name)
10811081
when nil, '(null)', '(NULL)'
10821082
nil
10831083
else
1084-
ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/)[1]
1084+
match_data = ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/)
1085+
match_data ? match_data[1] : nil
10851086
end
10861087
ci[:null] = ci[:is_nullable].to_i == 1 ; ci.delete(:is_nullable)
10871088
ci

0 commit comments

Comments
 (0)