aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add link to API Documentation GuidelinesDave Powers2014-11-011-0/+1
| | | | Link to the "English" section to specify American English be used for the Guides [ci skip]
* [ci skip] `Relation#bind` is not public APISean Griffin2014-11-011-1/+1
|
* Fix test which failed in isolationSean Griffin2014-11-011-0/+1
| | | | It was transitively relying on the vertex model being loaded
* Use bind values for joined tables in where statementsSean Griffin2014-11-018-1/+43
| | | | | | | | | | | | | | | In practical terms, this allows serialized columns and tz aware columns to be used in wheres that go through joins, where they previously would not behave correctly. Internally, this removes 1/3 of the cases where we rely on Arel to perform type casting for us. There were two non-obvious changes required for this. `update_all` on relation was merging its bind values with arel's in the wrong order. Additionally, through associations were assuming there would be no bind parameters in the preloader (presumably because the where would always be part of a join) [Melanie Gilman & Sean Griffin]
* Merge pull request #17463 from mrgilman/remove-index-from-substitute-atSean Griffin2014-11-013-7/+6
|\ | | | | Remove redundant substitute index when constructing bind values
| * Remove redundant substitute index when constructing bind valuesMelanie Gilman2014-10-313-7/+6
| | | | | | | | | | | | We end up re-ordering them either way when we construct the Arel AST (in order to deal with rewhere, etc), so we shouldn't bother giving it a number in the first place beforehand.
* | Merge pull request #17477 from Adam89/ma-remove-redundant-requireRichard Schneeman2014-11-011-1/+0
|\ \ | | | | | | Remove redundant require of file
| * | Remove redundant require of fileAdam892014-11-011-1/+0
| | | | | | | | | | | | | | | This file was required inside 'test/validators/namespace/email_validator.rb' that's already required here. Therefore I removed the redundant required.
* | | Don't needlessly alphabetize columns for insert/updateSean Griffin2014-11-011-4/+3
| | | | | | | | | | | | | | | This slightly simplifies the code, and reduces the number of times we need to iterate over the attributes by one.
* | | Tiny documentation fixes and styling improvementsRobin Dupret2014-11-012-12/+17
|/ / | | | | | | [ci skip]
* | Merge pull request #17474 from kuldeepaggarwal/fix-indentaionRafael Mendonça França2014-11-011-1/+1
|\ \ | | | | | | add missing space.[ci skip]
| * | add missing space.[ci skip]Kuldeep Aggarwal2014-11-011-1/+1
|/ /
* | Merge pull request #17470 from keikun17/masterZachary Scott2014-10-311-2/+1
|\ \ | | | | | | [ci skip] Fix line break on asset pipeline guide
| * | Fix break on generated htmlCakey | Buddy Magsipoc2014-11-011-2/+1
|/ / | | | | | | | | fixes this : ![http://i.imgur.com/86scI3a.png](http://i.imgur.com/86scI3a.png))
* | remove unused and untested APIAaron Patterson2014-10-311-6/+2
| |
* | fix set_pk_sequence and add a test for it.Aaron Patterson2014-10-312-1/+9
| |
* | Added region sequencing of primary keys for Postgres.Joe Rafaniello2014-10-311-0/+21
|/ | | | | | | Skip setting sequence on a table create if the value is 0 since it will start the first value at 1 anyway. This fixes the PG error 'setval: value 0 is out of bounds for sequence vms_id_seq...' encountered when migrating a new DB. BugzID: 15452,9772,13475,16850
* Don't attempt to load the schema file in tests if none existsSean Griffin2014-10-312-3/+18
|
* Don't modify the columns hash to set defaults from the attributes APISean Griffin2014-10-313-14/+39
| | | | | Nothing is directly using the columns for the default values anymore. This step helps us get closer not not mutating the columns hash.
* Load test schema even if there are no migrationsSean Griffin2014-10-312-1/+18
| | | | Fixes #17170
* Merge pull request #17040 from clyfe/patch-1Rafael Mendonça França2014-10-311-2/+4
|\ | | | | Explicit route test class
| * Explicit route test classClaudius Nicolae2014-09-241-2/+4
| | | | | | shows the class that the test must extend in order to have the assert_routing method available
* | Merge pull request #17305 from ↵Rafael Mendonça França2014-10-312-1/+90
|\ \ | | | | | | | | | | | | ziggythehamster/activerecord-connectionhandling-RAILS_ENV-without-rails If Rails is not defined, check ENV["RAILS_ENV"] and ENV["RACK_ENV"] in ActiveRecord::ConnectionHandling
| * | If Rails is not defined, check ENV["RAILS_ENV"] and ENV["RACK_ENV"].Keith Gable2014-10-212-1/+90
| | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by 6cc03675d30b58e28f585720dad14e947a57ff5b. ActiveRecord, if used without Rails, always checks the "default_env" environment. This would be OK, except that Sinatra also supports environments, and it runs with {RACK|RAILS}_ENV=production. This patch adds a fallback to RAILS_ENV and RACK_ENV (and ultimately default_env) if Rails.env doesn't exist.
* | | Merge pull request #17462 from vipulnsward/actionmailer-doc-fixRafael Mendonça França2014-10-311-2/+7
|\ \ \ | | | | | | | | AM README fixes [ci skip]
| * | | - Changed redundant user of `deliver` to `deliver_now`Vipul A M2014-11-011-2/+7
| | | | | | | | | | | | | | | | | | | | - Wrapped text in setting defaults section. Also added break, to a sentence. [ci skip]
* | | | Use the correct values for int max and minSean Griffin2014-10-313-56/+119
| | | | | | | | | | | | | | | | | | | | We had accidentally gone one power of two too far. In addition, we need to handle minimum values as well as the maximum.
* | | | Tiny documentation improvements [ci skip]Robin Dupret2014-10-313-11/+8
| | | |
* | | | Merge branch 'tags-public-send'Rafael Mendonça França2014-10-312-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes #14180 Fixes #17461
| * | | | Improve test of private properties of objects in form tagsRafael Mendonça França2014-10-311-28/+9
| | | | |
| * | | | Use public_send for form tagsagius2014-10-311-0/+27
| | | | |
| * | | | Honor public/private in ActionView::Helpers::Tags::Base#valueTobias Pfeiffer2014-10-312-1/+7
|/ / / / | | | | | | | | | | | | | | | | * use public_send instead of send to avoid calling private methods in form helpers
* | | | Merge pull request #17459 from sgrif/sg-find-by-large-numbersSean Griffin2014-10-319-18/+56
|\ \ \ \ | |/ / / |/| | | Treat strings greater than int max value as out of range
| * | | Treat strings greater than int max value as out of rangeSean Griffin2014-10-319-18/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sufficiently large integers cause `find` and `find_by` to raise `StatementInvalid` instead of `RecordNotFound` or just returning `nil`. Given that we can't cast to `nil` for `Integer` like we would with junk data for other types, we raise a `RangeError` instead, and rescue in places where it would be highly unexpected to get an exception from casting. Fixes #17380
* | | | Merge pull request #17460 from hbriggs/masterAbdelkader Boudih2014-10-311-4/+7
|\ \ \ \ | |/ / / |/| | | Masked authenticity token section, finder options details, misc typos [ci skip]
| * | | Add masked authenticity token section, details on finder options, misc typos ↵Hannah Briggs2014-10-311-5/+8
| | | | | | | | | | | | | | | | [ci skip]
* | | | Rename `default_attributes` to `_default_attributes`Sean Griffin2014-10-312-3/+3
| | | | | | | | | | | | | | | | | | | | It is internal use only. This is to avoid conflicting with users' method names. Fixes #17458
* | | | Don't require calculations to be aliased to a columnSean Griffin2014-10-312-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Arel has changed so that `.sum` no longer aliases `SUM(the_column)` to `sum_id`. This means the type returned by the adapter will be at the key `"SUM(the_column)"`. Longer term, we should eventually be able to retain type information from the AR::Base subclasses used in joined queries
* | | | Do not package the guides outputRafael Mendonça França2014-10-311-1/+1
| | | | | | | | | | | | | | | | Fixes #17455
* | | | Merge pull request #17451 from y-yagi/fix_asi_guideAbdelkader Boudih2014-10-311-5/+5
|\ \ \ \ | | | | | | | | | | [ci skip] fix incorrect key in Active Support Instrumentation guide
| * | | | [ci skip] fix incorrect key in Active Support Instrumentation guideyuuji.yaginuma2014-10-311-5/+5
|/ / / /
* | | | Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-3010-10/+10
| | | |
* | | | Use released arelGodfrey Chan2014-10-302-2/+2
| | | |
* | | | Merge pull request #17440 from claudiob/remove-yet-another-redundant-to-sXavier Noria2014-10-309-15/+15
|\ \ \ \ | | | | | | | | | | Remove redundant `to_s` in interpolation
| * | | | Remove redundant `to_s` in interpolationclaudiob2014-10-309-15/+15
| | | | |
* | | | | Merge branch 'master-sec'Aaron Patterson2014-10-302-4/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * master-sec: FileHandler should not be called for files outside the root
| * | | | | FileHandler should not be called for files outside the rootAaron Patterson2014-10-102-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileHandler#matches? should return false for files that are outside the "root" path.
* | | | | | Add status code to AS::Instrumentation table, like #17441 [ci skip]Zachary Scott2014-10-301-0/+1
| | | | | |
* | | | | | Merge branch 'strzalek-asn-docs-fix'Zachary Scott2014-10-301-0/+1
|\ \ \ \ \ \
| * | | | | | Add :db_runtime to table [ci skip]Łukasz Strzałkowski2014-10-301-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | It was missing from table, but is present in sample hash below