aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* instrumenter can't be cached because the app could be called fromAaron Patterson2013-10-041-3/+4
| | | | different threads.
* log the statement name along with the SQLAaron Patterson2013-10-044-6/+20
|
* log every sql statement, even when they errorAaron Patterson2013-10-041-25/+25
|
* prepare the statement inside the begin / rescue blockAaron Patterson2013-10-041-4/+4
|
* rm LogIntercepterAaron Patterson2013-10-041-15/+0
|
* stop adding singleton methods to the SQLite3 connectionAaron Patterson2013-10-041-11/+11
|
* stop adding singleton methods to the mysql2 adapterAaron Patterson2013-10-043-22/+22
|
* stop adding singleton methods to the PG connectionAaron Patterson2013-10-041-11/+26
|
* wrap logging around the actual query call itself.Aaron Patterson2013-10-042-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_targetArthur Neves2013-10-041-0/+13
|
* Merge pull request #12437 from websiteswithclass/masterRafael Mendonça França2013-10-041-6/+6
|\ | | | | Fixed typo in documentation
| * Fixed return strings in documentationJoseph Zidell2013-10-031-3/+3
| |
| * Fixed typo in documentationJoseph Zidell2013-10-031-3/+3
| |
* | Merge pull request #12440 from arunagw/minor-fix-running-unit-test-fileYves Senn2013-10-041-1/+1
|\ \ | | | | | | Directory name in RUNNING_UNIT_TESTS.rdoc [ci skip]
| * | Directory name in RUNNING_UNIT_TESTS.rdoc [ci skip]Arun Agrawal2013-10-041-1/+1
|/ /
* | inject down the hash cacheAaron Patterson2013-10-031-3/+2
| |
* | hashes are ordered, so we do not need to sortAaron Patterson2013-10-031-3/+3
| |
* | Always pass parameters to `build`Aaron Patterson2013-10-031-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 constructionAaron Patterson2013-10-032-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 Patterson2013-10-032-6/+6
| |
* | parent is always passed in, so make it non-optionalAaron Patterson2013-10-031-1/+1
| |
* | require the files we need so the classes are stand-aloneAaron Patterson2013-10-033-1/+4
|/
* Merge pull request #12435 from sikachu/master-port-12084Aaron Patterson2013-10-032-1/+10
|\ | | | | Port test from cf1904f to avoid future regression
| * Port test from cf1904f to avoid future regressionPrem Sichanugrist2013-10-032-1/+10
| | | | | | | | Related issue: #11939, #12084
* | map the association chain to table namesAaron Patterson2013-10-031-4/+2
|/
* Merge pull request #8791 from griffinmyers/masterRafael Mendonça França2013-10-033-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 attributesWilliam Myers2013-05-273-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/masterYves Senn2013-10-031-1/+1
|\ \ | | | | | | Fix a typo in the code of Testing guide. [ci skip]
| * | Fix a typo in the code of Testing guide.Geoffrey Roguelon2013-10-031-1/+1
|/ / | | | | | | Replace the word «Accepts» by «Accept» in the example of custom request headers.
* | Merge pull request #12430 from vipulnsward/changelog_fixYves Senn2013-10-031-1/+1
|\ \ | | | | | | `intiantiated` => `instantiated` [ci skip]
| * | `intiantiated` => `instantiated` [ci-skip]Vipul A M2013-10-031-1/+1
|/ /
* | fix the variable nameAaron Patterson2013-10-021-7/+7
| |
* | preheat habtm column cacheAaron Patterson2013-10-021-0/+1
| |
* | add missing requireAaron Patterson2013-10-021-0/+1
| |
* | remove some duplicate codeAaron Patterson2013-10-021-8/+1
| |
* | Merge branch 'master' into habtmAaron Patterson2013-10-021-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 Noria2013-10-031-14/+11
| | |
* | | add a note to the changelogAaron Patterson2013-10-021-0/+3
| | |
* | | remove HABTM associationsAaron Patterson2013-10-025-66/+0
| | |
* | | remove HABTM special cases from reflectionsAaron Patterson2013-10-021-14/+2
| | |
* | | remove the HABTM preloaderAaron Patterson2013-10-022-74/+0
| | |
* | | remove HABTM special cases from associations classesAaron Patterson2013-10-024-31/+1
| | |
* | | remove HABTM special cases from the fixturesAaron Patterson2013-10-021-12/+0
| | |
* | | repurpose the HABTM builder classAaron Patterson2013-10-022-29/+3
| | |
* | | goodbye has_and_belongs_to_many1, we will miss you!Aaron Patterson2013-10-021-4/+0
| | |
* | | keep track of the left and right reflections and expose thoseAaron Patterson2013-10-022-6/+6
| | |
* | | have the builder create the middle reflectionAaron Patterson2013-10-022-13/+15
| | |
* | | call the class method to define the callbacksAaron Patterson2013-10-021-1/+1
| | |
* | | Merge branch 'master' into habtmAaron Patterson2013-10-0215-61/+150
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: we can define callbacks without a builder instance push methods that don't depend on the instance to the class get the name from the reflection cache the name and options on the stack decouple belongs_to callback definition from the builder instance. add_before_destroy_callbacks doesn't depend on the instance, so push it to the class. valid_options doesn't depend on the instance, so push it to the class use the information on the reflection to determine whether callbacks should be added Running all isolated test for actionview association builder is no longer needed for counter cache, so remove it push constructable? on to the reflection Adds the Rails maintenance policy to the Guides name is on the reflection, so just use the reflection decouple define_callback from the instance Added activemodel as a explicit dependency unify `Fixes` notes in AR changelog. [ci skip]. improving `reload` doc wording. #12418 [ci skip] Update AR reload doc for the case of manually set primary key attribute [ci skip]
| * | we can define callbacks without a builder instanceAaron Patterson2013-10-024-9/+9
| | |