diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-05-29 22:08:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-29 22:08:20 -0400 |
| commit | 0aa6bcdf612aa05e422f1f55278bab49a7a9153e (patch) | |
| tree | 9269d094f955833f4bddce2ef0ca03815c6a52af /activerecord/lib/active_record | |
| parent | a5faf2df7a2dec74df575f23db417cc323f4bbe2 (diff) | |
| parent | a0d17760bbc6254e0231a42300c842501aca080e (diff) | |
| download | rails-0aa6bcdf612aa05e422f1f55278bab49a7a9153e.tar.gz rails-0aa6bcdf612aa05e422f1f55278bab49a7a9153e.tar.bz2 rails-0aa6bcdf612aa05e422f1f55278bab49a7a9153e.zip | |
Merge pull request #29278 from kamipo/fix_uuid_column_with_null_true_and_default_nil
Fix UUID column with `null: true` and `default: nil`
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb index da8d0c6992..44eb666965 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb @@ -62,7 +62,7 @@ module ActiveRecord def quote_default_expression(value, column) # :nodoc: if value.is_a?(Proc) value.call - elsif column.type == :uuid && value.include?("()") + elsif column.type == :uuid && /\(\)/.match?(value) value # Does not quote function default values for UUID columns elsif column.respond_to?(:array?) value = type_cast_from_column(column, value) |