diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-07-27 19:31:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 19:31:53 +0900 |
| commit | 4caf751fffcd0d25b563bd5fd13fc075560aa8d5 (patch) | |
| tree | 2674ec270191b12fcf104906e2d51b557297d763 /activerecord | |
| parent | d3c1266c338c3a37181c0a131c7d983e5e30c8d0 (diff) | |
| parent | 569cd97c80de95154312a0b33596211e55722a9e (diff) | |
| download | rails-4caf751fffcd0d25b563bd5fd13fc075560aa8d5.tar.gz rails-4caf751fffcd0d25b563bd5fd13fc075560aa8d5.tar.bz2 rails-4caf751fffcd0d25b563bd5fd13fc075560aa8d5.zip | |
Merge pull request #28695 from koic/integer_type_has_precision_option_in_oracle
Fix an AR test of schema dump when using Oracle
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/comment_test.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/test/cases/comment_test.rb b/activerecord/test/cases/comment_test.rb index 27d042db47..9ab6607668 100644 --- a/activerecord/test/cases/comment_test.rb +++ b/activerecord/test/cases/comment_test.rb @@ -115,7 +115,11 @@ if ActiveRecord::Base.connection.supports_comments? assert_match %r[t\.string\s+"name",\s+comment: "Comment should help clarify the column purpose"], output assert_match %r[t\.string\s+"obvious"\n], output assert_match %r[t\.string\s+"content",\s+comment: "Whoa, content describes itself!"], output - assert_match %r[t\.integer\s+"rating",\s+comment: "I am running out of imagination"], output + if current_adapter?(:OracleAdapter) + assert_match %r[t\.integer\s+"rating",\s+precision: 38,\s+comment: "I am running out of imagination"], output + else + assert_match %r[t\.integer\s+"rating",\s+comment: "I am running out of imagination"], output + end unless current_adapter?(:OracleAdapter) assert_match %r[t\.index\s+.+\s+comment: "\\\"Very important\\\" index that powers all the performance.\\nAnd it's fun!"], output assert_match %r[t\.index\s+.+\s+name: "idx_obvious",\s+comment: "We need to see obvious comments"], output |