aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* match against bind valuesAaron Patterson2014-01-141-2/+2
|
* comment out the sqlite3 debug code (for now)Aaron Patterson2014-01-141-0/+7
|
* fix statement cache executionAaron Patterson2014-01-141-7/+6
|
* fix cache class interfaceAaron Patterson2014-01-142-22/+26
|
* unscoping a where should remove bind valuesAaron Patterson2014-01-141-0/+2
|
* remove dead codeAaron Patterson2014-01-141-2/+0
|
* Merge branch 'master' into set_bindsAaron Patterson2014-01-140-0/+0
|\ | | | | | | | | * master: "string" isn't a valid column type for ActiveRecord
| * "string" isn't a valid column type for ActiveRecordAaron Patterson2014-01-141-1/+1
| | | | | | | | | | Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
* | drop the dual encodings tableAaron Patterson2014-01-141-2/+2
| |
* | where needs to bring the bind params when creating a new relationAaron Patterson2014-01-141-0/+3
| |
* | `where` makes bind values, so stop manually creating themAaron Patterson2014-01-141-11/+3
| |
* | switch to arrays for bind removal testAaron Patterson2014-01-141-4/+2
| | | | | | | | we can't make bind values for arrays yet
* | `where` creates binds, so do not create them manuallyAaron Patterson2014-01-141-2/+1
| |
* | we should not be copying these. fixes ↵Aaron Patterson2014-01-141-4/+0
| | | | | | | | test_find_all_using_where_with_relation_with_bound_values
* | Merge branch 'master' into set_bindsAaron Patterson2014-01-1419-59/+163
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * master: don't establish a new connection when testing with `sqlite3_mem`. sqlite >= 3.8.0 supports partial indexes Don't try to get the subclass if the inheritance column doesn't exist Enum mappings are now exposed via class methods instead of constants. Fix fields_for documentation with index option [ci skip] quick pass through Active Record CHANGELOG. [ci skip] [ci skip] Grammar correction single quotes for controller generated routes [ci skip] Added alias to CSRF Set NameError#name
| * don't establish a new connection when testing with `sqlite3_mem`.Yves Senn2014-01-141-15/+21
| | | | | | | | | | | | | | This fixes broken `rake test_sqlite3_mem` suite for Active Record. The problem is that that the old database with the schema is lost when establishing a new connection. Upon reconnting we are left with a blank database and tests down the line start failing.
| * Merge pull request #13350 from ccutrer/sqlite-partial-indexesYves Senn2014-01-143-1/+25
| |\ | | | | | | sqlite >= 3.8.0 supports partial indexes
| | * sqlite >= 3.8.0 supports partial indexesCody Cutrer2014-01-143-1/+25
| |/
| * Merge pull request #13710 from ujjwalt/hotfix/stiAndrew White2014-01-145-8/+42
| |\ | | | | | | Active Record's subclass_from_attributes shouldn't assume :type is for STI unless there is a type column.
| | * Don't try to get the subclass if the inheritance column doesn't existUjjwal Thaakar2014-01-145-8/+42
| |/ | | | | | | | | | | | | The `subclass_from_attrs` method is called even if the column specified by the `inheritance_column` setting doesn't exist. This prevents setting associations via the attributes hash if the association name clashes with the value of the setting, typically `:type`. This worked previously in Rails 3.2.
| * Enum mappings are now exposed via class methods instead of constants.Godfrey Chan2014-01-143-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: class Conversation < ActiveRecord::Base enum status: [ :active, :archived ] end Before: Conversation::STATUS # => { "active" => 0, "archived" => 1 } After: Conversation.statuses # => { "active" => 0, "archived" => 1 }
| * Merge pull request #13705 from mess110/controller_generator_route_quotesCarlos Antonio da Silva2014-01-145-11/+15
| |\ | | | | | | Single quotes for controller generated routes. This is more consistent with all other Rails generated code.
| | * single quotes for controller generated routesCristian Mircea Messel2014-01-145-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write routes in route.rb with single quotes get 'welcome/index' instead of get "welcome/index"
| * | Merge pull request #13706 from prathamesh-sonpatki/issue-13125Yves Senn2014-01-141-3/+10
| |\ \ | | | | | | | | Fix fields_for documentation with index option [ci skip]
| | * | Fix fields_for documentation with index option [ci skip]Prathamesh Sonpatki2014-01-141-3/+10
| | |/ | | | | | | | | | | | | | | | | | | - fields_for documentation with index option was wrong. - It does not work with passing model as it is. - Changed the example by passing id of the address object. - Fixes #13125.
| * | Merge pull request #13709 from akshay-vishnoi/typoYves Senn2014-01-141-1/+1
| |\ \ | | | | | | | | [ci skip] Grammar correction
| | * | [ci skip] Grammar correctionAkshay Vishnoi2014-01-141-1/+1
| | | |
| * | | quick pass through Active Record CHANGELOG. [ci skip]Yves Senn2014-01-141-7/+9
| | | |
| * | | Merge pull request #13669 from chulkilee/name-error-nameYves Senn2014-01-143-2/+8
| |\ \ \ | | | | | | | | | | Set NameError#name
| | * | | Set NameError#nameChulki Lee2014-01-133-2/+8
| | | | |
| * | | | Merge pull request #13707 from udaykadaboina/docModificationDamien Mathieu2014-01-131-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | | [ci skip] Added alias to CSRF
| | * | | [ci skip] Added alias to CSRFUday Kadaboina2014-01-141-2/+2
| |/ / /
* | | | remove dead codeAaron Patterson2014-01-141-3/+0
| | | |
* | | | adjust AST tests to respect bind valuesAaron Patterson2014-01-141-21/+61
| | | |
* | | | where uses bind values so we don't need to manually create themAaron Patterson2014-01-141-11/+3
| | | |
* | | | remove test that does not apply anymoreAaron Patterson2014-01-141-12/+1
| | | |
* | | | explains for prepared statements should never have binds in SQLite3Aaron Patterson2014-01-131-1/+1
| | | |
* | | | fixing column alias resolutionAaron Patterson2014-01-131-1/+1
| | | |
* | | | fix tests for explain plan + bindsAaron Patterson2014-01-132-3/+3
| | | |
* | | | replace bind values on calls to to_sqlAaron Patterson2014-01-132-4/+8
| | | |
* | | | do not clear out bind parameters on unscopeAaron Patterson2014-01-131-3/+0
| | | |
* | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-1338-188/+291
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) unscope should remove bind values associated with the where reverse_order_value= is not private, so no need to send avoid more dynamic symbols no need to to_sym recover from test runs that leave the database in a bad state updates screenshot data [ci skip] "serie" => "series" revises a few things in the getting started guide [ci skip] Favor canonical environment variables for secrets removed extra comma [ci skip] Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. Updated Changelog to reflect removal of :dependent => :restrict standardize on jruby_skip & rbx_skip fix bug in becomes! when changing from base to subclass. Closes #13272. highlight http://localhost:3000 in README.md. Closes #13643. [ci skip] doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] Skip Spring App Generator tests on JRuby fixes a typo in a CHANGELOG upgrade SDoc fixes the Gemfile generator templates ... Conflicts: activerecord/test/cases/hot_compatibility_test.rb
| * | | unscope should remove bind values associated with the whereAaron Patterson2014-01-132-0/+11
| | | |
| * | | reverse_order_value= is not private, so no need to sendAaron Patterson2014-01-131-1/+1
| | | | | | | | | | | | | | | | It's not public API, but is not private scoped.
| * | | avoid more dynamic symbolsAaron Patterson2014-01-131-1/+1
| | | |
| * | | no need to to_symAaron Patterson2014-01-131-2/+2
| | | |
| * | | Merge pull request #13704 from waynn/patch-4Rafael Mendonça França2014-01-131-2/+2
| |\ \ \ | | | | | | | | | | "serie" => "series"
| | * | | "serie" => "series"Waynn Lue2014-01-131-2/+2
| | | | |
| * | | | recover from test runs that leave the database in a bad stateAaron Patterson2014-01-131-1/+1
| | | | |
| * | | | updates screenshot data [ci skip]Xavier Noria2014-01-131-1/+1
| |/ / /