diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 12:52:49 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 12:52:49 -0300 |
| commit | 54d8c81fefdb566c2f317afd0142cade0273bdbc (patch) | |
| tree | f1d77594855b8d706ca557ecdd551b4a0c16e524 /activerecord/test/cases/schema_dumper_test.rb | |
| parent | b9774a594339d5ac92503d91d180d88ec1faf436 (diff) | |
| parent | 933063188870347b59b35d4f96df21864d0f8f0b (diff) | |
| download | rails-54d8c81fefdb566c2f317afd0142cade0273bdbc.tar.gz rails-54d8c81fefdb566c2f317afd0142cade0273bdbc.tar.bz2 rails-54d8c81fefdb566c2f317afd0142cade0273bdbc.zip | |
Merge pull request #12016 from roderickvd/uuid_fixes
Auto-generate stable fixture UUIDs on PostgreSQL
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/fixtures.rb
activerecord/test/cases/adapters/postgresql/uuid_test.rb
activesupport/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/schema_dumper_test.rb')
| -rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index 575eb34a9c..fd0ef2f89f 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -63,7 +63,7 @@ class SchemaDumperTest < ActiveRecord::TestCase next if column_set.empty? lengths = column_set.map do |column| - if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean)\s+"/) + if match = column.match(/t\.(?:integer|decimal|float|datetime|timestamp|time|date|text|binary|string|boolean|uuid)\s+"/) match[0].length end end |