Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Assert presence of "frozen" in error message, not the full MRI message. | Federico Ravasio | 2013-10-08 | 1 | -1/+3 |
| | | | | | | | | | | Related to all the other issues regarding message independent assertions to make Rails compatible with other Ruby implementations other than MRI. The best way here would be to have a specific error raised when modifying frozen objects, like FrozenObjectError or something. But since Ruby doesn't provide such a thing, we must limit the assertion to the lowest common denominator, which is word "frozen". | ||||
* | Just change ENV and restore it afterwards. | Federico Ravasio | 2013-10-07 | 1 | -1/+4 |
| | | | | | | | | | | | Stubbing ENV[] is not safe outside MRI. At some point after the stubbing has occurred a backtrace is printed to the ActiveSupport warning log: there Rubinius accesses ENV['RBX_NOCOLOR'] to determine if it should print the backtrace with colors or not, causing the stub to fail. Other implementations might access ENV in a different way too, we just can't predict it. The only thing we can do here is to actually set the ENV with what we want and restore it afterwards. | ||||
* | instrumenter can't be cached because the app could be called from | Aaron Patterson | 2013-10-04 | 1 | -3/+4 |
| | | | | different threads. | ||||
* | log the statement name along with the SQL | Aaron Patterson | 2013-10-04 | 4 | -6/+20 |
| | |||||
* | log every sql statement, even when they error | Aaron Patterson | 2013-10-04 | 1 | -25/+25 |
| | |||||
* | prepare the statement inside the begin / rescue block | Aaron Patterson | 2013-10-04 | 1 | -4/+4 |
| | |||||
* | rm LogIntercepter | Aaron Patterson | 2013-10-04 | 1 | -15/+0 |
| | |||||
* | stop adding singleton methods to the SQLite3 connection | Aaron Patterson | 2013-10-04 | 1 | -11/+11 |
| | |||||
* | stop adding singleton methods to the mysql2 adapter | Aaron Patterson | 2013-10-04 | 3 | -22/+22 |
| | |||||
* | stop adding singleton methods to the PG connection | Aaron Patterson | 2013-10-04 | 1 | -11/+26 |
| | |||||
* | wrap logging around the actual query call itself. | Aaron Patterson | 2013-10-04 | 2 | -50/+50 |
| | | | | This is to be consistent with the way the mysql2 adapter times queries | ||||
* | add regression test for set_inverse_instance on add_to_target | Arthur Neves | 2013-10-04 | 1 | -0/+13 |
| | |||||
* | Merge pull request #12437 from websiteswithclass/master | Rafael Mendonça França | 2013-10-04 | 1 | -6/+6 |
|\ | | | | | Fixed typo in documentation | ||||
| * | Fixed return strings in documentation | Joseph Zidell | 2013-10-03 | 1 | -3/+3 |
| | | |||||
| * | Fixed typo in documentation | Joseph Zidell | 2013-10-03 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #12440 from arunagw/minor-fix-running-unit-test-file | Yves Senn | 2013-10-04 | 1 | -1/+1 |
|\ \ | | | | | | | Directory name in RUNNING_UNIT_TESTS.rdoc [ci skip] | ||||
| * | | Directory name in RUNNING_UNIT_TESTS.rdoc [ci skip] | Arun Agrawal | 2013-10-04 | 1 | -1/+1 |
|/ / | |||||
* | | inject down the hash cache | Aaron Patterson | 2013-10-03 | 1 | -3/+2 |
| | | |||||
* | | hashes are ordered, so we do not need to sort | Aaron Patterson | 2013-10-03 | 1 | -3/+3 |
| | | |||||
* | | Always pass parameters to `build` | Aaron Patterson | 2013-10-03 | 1 | -2/+2 |
| | | | | | | | | | | We always know the parameters in advance, so we don't need to build it in to the method signature | ||||
* | | Set the join type on construction | Aaron Patterson | 2013-10-03 | 2 | -6/+5 |
| | | | | | | | | | | We always set the join type immediately after construction, just make it part of the constructor and we can skip that step | ||||
* | | simplify the JoinAssociation constructor, check validity *before* | Aaron Patterson | 2013-10-03 | 2 | -6/+6 |
| | | |||||
* | | parent is always passed in, so make it non-optional | Aaron Patterson | 2013-10-03 | 1 | -1/+1 |
| | | |||||
* | | require the files we need so the classes are stand-alone | Aaron Patterson | 2013-10-03 | 3 | -1/+4 |
|/ | |||||
* | Merge pull request #12435 from sikachu/master-port-12084 | Aaron Patterson | 2013-10-03 | 2 | -1/+10 |
|\ | | | | | Port test from cf1904f to avoid future regression | ||||
| * | Port test from cf1904f to avoid future regression | Prem Sichanugrist | 2013-10-03 | 2 | -1/+10 |
| | | | | | | | | Related issue: #11939, #12084 | ||||
* | | map the association chain to table names | Aaron Patterson | 2013-10-03 | 1 | -4/+2 |
|/ | |||||
* | Merge pull request #8791 from griffinmyers/master | Rafael Mendonça França | 2013-10-03 | 3 | -2/+22 |
|\ | | | | | | | | | | | | | Updated DirtyModel's @changed_attributes hash to be symbol/string agnostic Conflicts: activemodel/CHANGELOG.md | ||||
| * | DirtyModel uses a hash to keep track of any changes made to attributes | William Myers | 2013-05-27 | 3 | -2/+22 |
| | | | | | | | | | | | | | | | | | | of an instance. When using the attribute_will_change! method, you must supply a string and not a symbol or the *_changed? method will break (because it is looking for the attribute name as a string in the keys of the underlying hash). To remedy this, I simply made the underlying hash a HashWithIndifferentAccess so it won't matter if you supply the attribute name as a symbol or string to attribute_will_change!. | ||||
* | | Merge pull request #12431 from GRoguelon/master | Yves Senn | 2013-10-03 | 1 | -1/+1 |
|\ \ | | | | | | | Fix a typo in the code of Testing guide. [ci skip] | ||||
| * | | Fix a typo in the code of Testing guide. | Geoffrey Roguelon | 2013-10-03 | 1 | -1/+1 |
|/ / | | | | | | | Replace the word «Accepts» by «Accept» in the example of custom request headers. | ||||
* | | Merge pull request #12430 from vipulnsward/changelog_fix | Yves Senn | 2013-10-03 | 1 | -1/+1 |
|\ \ | | | | | | | `intiantiated` => `instantiated` [ci skip] | ||||
| * | | `intiantiated` => `instantiated` [ci-skip] | Vipul A M | 2013-10-03 | 1 | -1/+1 |
|/ / | |||||
* | | fix the variable name | Aaron Patterson | 2013-10-02 | 1 | -7/+7 |
| | | |||||
* | | preheat habtm column cache | Aaron Patterson | 2013-10-02 | 1 | -0/+1 |
| | | |||||
* | | add missing require | Aaron Patterson | 2013-10-02 | 1 | -0/+1 |
| | | |||||
* | | remove some duplicate code | Aaron Patterson | 2013-10-02 | 1 | -8/+1 |
| | | |||||
* | | Merge branch 'master' into habtm | Aaron Patterson | 2013-10-02 | 1 | -14/+11 |
|\ \ | | | | | | | | | | | | | * master: copy-edits the new guide with our maintenance policy [ci skip] | ||||
| * | | copy-edits the new guide with our maintenance policy [ci skip] | Xavier Noria | 2013-10-03 | 1 | -14/+11 |
| | | | |||||
* | | | add a note to the changelog | Aaron Patterson | 2013-10-02 | 1 | -0/+3 |
| | | | |||||
* | | | remove HABTM associations | Aaron Patterson | 2013-10-02 | 5 | -66/+0 |
| | | | |||||
* | | | remove HABTM special cases from reflections | Aaron Patterson | 2013-10-02 | 1 | -14/+2 |
| | | | |||||
* | | | remove the HABTM preloader | Aaron Patterson | 2013-10-02 | 2 | -74/+0 |
| | | | |||||
* | | | remove HABTM special cases from associations classes | Aaron Patterson | 2013-10-02 | 4 | -31/+1 |
| | | | |||||
* | | | remove HABTM special cases from the fixtures | Aaron Patterson | 2013-10-02 | 1 | -12/+0 |
| | | | |||||
* | | | repurpose the HABTM builder class | Aaron Patterson | 2013-10-02 | 2 | -29/+3 |
| | | | |||||
* | | | goodbye has_and_belongs_to_many1, we will miss you! | Aaron Patterson | 2013-10-02 | 1 | -4/+0 |
| | | | |||||
* | | | keep track of the left and right reflections and expose those | Aaron Patterson | 2013-10-02 | 2 | -6/+6 |
| | | | |||||
* | | | have the builder create the middle reflection | Aaron Patterson | 2013-10-02 | 2 | -13/+15 |
| | | | |||||
* | | | call the class method to define the callbacks | Aaron Patterson | 2013-10-02 | 1 | -1/+1 |
| | | |