diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2017-03-04 19:35:25 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2017-03-04 19:35:25 +0000 |
commit | 12038f6505cdbcdbea861c7ae5f272e918100e13 (patch) | |
tree | dc44bfc71a96287d30f109dd94afee51558734fc | |
parent | 1fd6bb6eece38a0dae6794dac8bcd3c0e26f0acf (diff) | |
parent | c0f621ae63b048c02a1c8341a7c093e8a76c0e7e (diff) | |
download | rails-12038f6505cdbcdbea861c7ae5f272e918100e13.tar.gz rails-12038f6505cdbcdbea861c7ae5f272e918100e13.tar.bz2 rails-12038f6505cdbcdbea861c7ae5f272e918100e13.zip |
Merge branch 'master' of github.com:rails/docrails
-rw-r--r-- | activerecord/test/cases/validations/uniqueness_validation_test.rb | 2 | ||||
-rw-r--r-- | guides/source/active_record_querying.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb index 277280b42e..28605d2f8e 100644 --- a/activerecord/test/cases/validations/uniqueness_validation_test.rb +++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb @@ -385,7 +385,7 @@ class UniquenessValidationTest < ActiveRecord::TestCase def test_validate_uniqueness_with_limit_and_utf8 if current_adapter?(:SQLite3Adapter) - # Event.title has limit 5, but does SQLite doesn't truncate. + # Event.title has limit 5, but SQLite doesn't truncate. e1 = Event.create(title: "一二三四五六七八") assert e1.valid?, "Could not create an event with a unique 8 characters title" diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md index 38a9d61f4b..31865ea375 100644 --- a/guides/source/active_record_querying.md +++ b/guides/source/active_record_querying.md @@ -1547,7 +1547,7 @@ SELECT people.id, people.name, comments.text FROM people INNER JOIN comments ON comments.person_id = people.id -WHERE comments.created_at = '2015-01-01' +WHERE comments.created_at > '2015-01-01' ``` ### Retrieving specific data from multiple tables |