Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | use edge arel | Aaron Patterson | 2014-01-15 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | some databases do not have bind params (mysql2) so take that in to account | Aaron Patterson | 2014-01-14 | 1 | -2/+6 | |
| | | | | ||||||
* | | | | fix exception translation | Aaron Patterson | 2014-01-14 | 2 | -3/+4 | |
| | | | | ||||||
* | | | | Merge branch 'master' into set_binds | Aaron Patterson | 2014-01-14 | 2 | -15/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: rm dup code Conflicts: activerecord/test/cases/relations_test.rb | |||||
| * | | | rm dup code | Aaron Patterson | 2014-01-14 | 1 | -13/+0 | |
| | | | | | | | | | | | | | | | | https://github.com/rails/rails/blob/e64a83cdbd3ce836f3339c600c1006b20c23d8fd/activerecord/test/cases/relation/merging_test.rb#L80-91 | |||||
* | | | | test bind value equality | Aaron Patterson | 2014-01-14 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | translate exceptions on prepared statement failure | Aaron Patterson | 2014-01-14 | 2 | -6/+13 | |
| | | | | ||||||
* | | | | reorder bind indexes if joins produced bind values | Aaron Patterson | 2014-01-14 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | expliticly make STI column a bind value | Aaron Patterson | 2014-01-14 | 1 | -4/+9 | |
| | | | | ||||||
* | | | | Merge branch 'master' into set_binds | Aaron Patterson | 2014-01-14 | 2 | -8/+7 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | * master: directly create the ARel AST Updated comment to mention the enum mapping class method [ci skip] | |||||
| * | | | directly create the ARel AST | Aaron Patterson | 2014-01-14 | 1 | -6/+4 | |
| | | | | | | | | | | | | | | | | rather than allocating a new Relation, just make the AST directly | |||||
| * | | | Updated comment to mention the enum mapping class method [ci skip] | Godfrey Chan | 2014-01-14 | 1 | -2/+3 | |
| | | | | ||||||
* | | | | take in to account existing bind parameters when building the bind list | Aaron Patterson | 2014-01-14 | 1 | -21/+20 | |
| | | | | ||||||
* | | | | match against bind values | Aaron Patterson | 2014-01-14 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | comment out the sqlite3 debug code (for now) | Aaron Patterson | 2014-01-14 | 1 | -0/+7 | |
| | | | | ||||||
* | | | | fix statement cache execution | Aaron Patterson | 2014-01-14 | 1 | -7/+6 | |
| | | | | ||||||
* | | | | fix cache class interface | Aaron Patterson | 2014-01-14 | 2 | -22/+26 | |
| | | | | ||||||
* | | | | unscoping a where should remove bind values | Aaron Patterson | 2014-01-14 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | remove dead code | Aaron Patterson | 2014-01-14 | 1 | -2/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' into set_binds | Aaron Patterson | 2014-01-14 | 0 | -0/+0 | |
|\| | | | | | | | | | | | | | | | | | | | * master: "string" isn't a valid column type for ActiveRecord | |||||
| * | | | "string" isn't a valid column type for ActiveRecord | Aaron Patterson | 2014-01-14 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb | |||||
* | | | drop the dual encodings table | Aaron Patterson | 2014-01-14 | 1 | -2/+2 | |
| | | | ||||||
* | | | where needs to bring the bind params when creating a new relation | Aaron Patterson | 2014-01-14 | 1 | -0/+3 | |
| | | | ||||||
* | | | `where` makes bind values, so stop manually creating them | Aaron Patterson | 2014-01-14 | 1 | -11/+3 | |
| | | | ||||||
* | | | switch to arrays for bind removal test | Aaron Patterson | 2014-01-14 | 1 | -4/+2 | |
| | | | | | | | | | | | | we can't make bind values for arrays yet | |||||
* | | | `where` creates binds, so do not create them manually | Aaron Patterson | 2014-01-14 | 1 | -2/+1 | |
| | | | ||||||
* | | | we should not be copying these. fixes ↵ | Aaron Patterson | 2014-01-14 | 1 | -4/+0 | |
| | | | | | | | | | | | | test_find_all_using_where_with_relation_with_bound_values | |||||
* | | | Merge branch 'master' into set_binds | Aaron Patterson | 2014-01-14 | 19 | -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 Senn | 2014-01-14 | 1 | -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-indexes | Yves Senn | 2014-01-14 | 3 | -1/+25 | |
| |\ \ | | | | | | | | | sqlite >= 3.8.0 supports partial indexes | |||||
| | * | | sqlite >= 3.8.0 supports partial indexes | Cody Cutrer | 2014-01-14 | 3 | -1/+25 | |
| |/ / | ||||||
| * | | Merge pull request #13710 from ujjwalt/hotfix/sti | Andrew White | 2014-01-14 | 5 | -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 exist | Ujjwal Thaakar | 2014-01-14 | 5 | -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 Chan | 2014-01-14 | 3 | -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_quotes | Carlos Antonio da Silva | 2014-01-14 | 5 | -11/+15 | |
| |\ \ | | | | | | | | | Single quotes for controller generated routes. This is more consistent with all other Rails generated code. | |||||
| | * | | single quotes for controller generated routes | Cristian Mircea Messel | 2014-01-14 | 5 | -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-13125 | Yves Senn | 2014-01-14 | 1 | -3/+10 | |
| |\ \ \ | | | | | | | | | | | Fix fields_for documentation with index option [ci skip] | |||||
| | * | | | Fix fields_for documentation with index option [ci skip] | Prathamesh Sonpatki | 2014-01-14 | 1 | -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/typo | Yves Senn | 2014-01-14 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | [ci skip] Grammar correction | |||||
| | * | | | [ci skip] Grammar correction | Akshay Vishnoi | 2014-01-14 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | quick pass through Active Record CHANGELOG. [ci skip] | Yves Senn | 2014-01-14 | 1 | -7/+9 | |
| | | | | | ||||||
| * | | | | Merge pull request #13669 from chulkilee/name-error-name | Yves Senn | 2014-01-14 | 3 | -2/+8 | |
| |\ \ \ \ | | | | | | | | | | | | | Set NameError#name | |||||
| | * | | | | Set NameError#name | Chulki Lee | 2014-01-13 | 3 | -2/+8 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #13707 from udaykadaboina/docModification | Damien Mathieu | 2014-01-13 | 1 | -2/+2 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | [ci skip] Added alias to CSRF | |||||
| | * | | | | [ci skip] Added alias to CSRF | Uday Kadaboina | 2014-01-14 | 1 | -2/+2 | |
| |/ / / / | ||||||
* | | | | | remove dead code | Aaron Patterson | 2014-01-14 | 1 | -3/+0 | |
| | | | | | ||||||
* | | | | | adjust AST tests to respect bind values | Aaron Patterson | 2014-01-14 | 1 | -21/+61 | |
| | | | | | ||||||
* | | | | | where uses bind values so we don't need to manually create them | Aaron Patterson | 2014-01-14 | 1 | -11/+3 | |
| | | | | | ||||||
* | | | | | remove test that does not apply anymore | Aaron Patterson | 2014-01-14 | 1 | -12/+1 | |
| | | | | | ||||||
* | | | | | explains for prepared statements should never have binds in SQLite3 | Aaron Patterson | 2014-01-13 | 1 | -1/+1 | |
| | | | | |