Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Fixes bug in ActiveRecord::QueryMethods, #1697" | Jon Leighton | 2011-09-04 | 1 | -2/+4 |
| | | | | | | This reverts commit 0df27c98d982ec87d2fb48cfda82694eb267993e. Reverted due to failing test, see #2845. | ||||
* | restores the API docs of AR::Fixtures, made a quick pass over them, revises ↵ | Xavier Noria | 2011-09-03 | 1 | -368/+361 |
| | | | | link in fixture template [closes #2840] | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 1 | -1/+1 |
|\ | |||||
| * | Improve examples: use each instead of for...in | Gabe Berke-Williams | 2011-08-31 | 1 | -1/+1 |
| | | |||||
* | | * Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731 | Aaron Patterson | 2011-09-01 | 2 | -2/+11 |
| | | |||||
* | | make sure encoding_aware? is available | Aaron Patterson | 2011-09-01 | 1 | -0/+2 |
| | | |||||
* | | Fixes bug in ActiveRecord::QueryMethods, #1697 | Joshua Wehner | 2011-08-31 | 1 | -4/+2 |
|/ | | | Replace split on comma with a regexp that will reverse all ASC/DESC specifically | ||||
* | Fix test failures on 1.8.7, since Object#initialize_dup is not defined there ↵ | Jon Leighton | 2011-08-29 | 1 | -1/+0 |
| | | | | (and this call to super is no essential, so easiest to simply remove) | ||||
* | Merge pull request #2021 from dasch/more_postgres_utils | Aaron Patterson | 2011-08-29 | 1 | -1/+3 |
|\ | | | | | Make #extract_schema_and_table an instance method in Utils | ||||
| * | Make #extract_schema_and_table an instance method in Utils | Daniel Schierbeck | 2011-07-09 | 1 | -1/+3 |
| | | | | | | | | Also, move the utils test into its own test case. | ||||
* | | Move clear_timestamp_attributes into Timestamp module | Jon Leighton | 2011-08-29 | 2 | -10/+14 |
| | | |||||
* | | The join_nodes must be passed to the JoinDependency initializer and ↵ | Jon Leighton | 2011-08-29 | 2 | -13/+14 |
| | | | | | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556. | ||||
* | | Move the bulk alter table code into the abstract mysql adapter, hence it is ↵ | Jon Leighton | 2011-08-29 | 2 | -47/+42 |
| | | | | | | | | supported for mysql2 as well now. | ||||
* | | Extract simplified_type into the abstract class | Jon Leighton | 2011-08-29 | 3 | -23/+24 |
| | | |||||
* | | Create an AbstractMysqlAdapter to abstract the common code between ↵ | Jon Leighton | 2011-08-29 | 3 | -1097/+706 |
| | | | | | | | | MysqlAdapter and Mysql2Adapter. | ||||
* | | clear and disable query cache when an exception is raised from called middleware | Aaron Patterson | 2011-08-28 | 1 | -0/+6 |
| | | |||||
* | | stop messing with the load path, load path should be adjusted in the test task | Aaron Patterson | 2011-08-26 | 1 | -7/+0 |
| | | |||||
* | | Force binary data inserted for a string data type to utf-8 and log an | Aaron Patterson | 2011-08-25 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database. | ||||
* | | Merge pull request #2679 from amatsuda/nullify_abstract_class_table_name | Aaron Patterson | 2011-08-24 | 1 | -0/+2 |
|\ \ | | | | | | | do not compute table names for abstract classes | ||||
| * | | do not compute table names for abstract classes | Akira Matsuda | 2011-08-24 | 1 | -0/+2 |
| | | | |||||
* | | | Adding missing autoload | Claudio Poli | 2011-08-24 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251 | Santiago Pastorino | 2011-08-22 | 1 | -1/+1 |
|\ \ | | | | | | | Use mysql_creation_options inside rescue block | ||||
| * | | Use mysql_creation_options inside rescue block | Jonathon M. Abbott | 2011-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Commit ecd37084b28a05f05251 did not take into account the use of creation_options inside the access denied exception handler. | ||||
* | | | Merge pull request #2600 from al/finder_sql_example_update | Xavier Noria | 2011-08-21 | 1 | -6/+10 |
|\ \ \ | | | | | | | | | Updated the docs for the has_many :finder_sql option | ||||
| * | | | Updated the docs for the has_many :finder_sql option to reflect changes made ↵ | Alan Larkin | 2011-08-20 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required. | ||||
* | | | | Fix PredicateBuilder clobbering select_values in subquery. | Ernie Miller | 2011-08-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix assumption of primary key name in PredicateBuilder subquery. | Ernie Miller | 2011-08-20 | 1 | -1/+1 |
|/ / / | |||||
* | | | prevent sql injection attacks by escaping quotes in column names | Aaron Patterson | 2011-08-16 | 3 | -3/+3 |
| | | | |||||
* | | | In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put ↵ | Jon Leighton | 2011-08-16 | 3 | -14/+26 |
| | | | | | | | | | | | | under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user. | ||||
* | | | Use new SelectManager#source method | Jon Leighton | 2011-08-15 | 2 | -2/+2 |
| | | | |||||
* | | | Use new SelectManager#projections= method | Jon Leighton | 2011-08-15 | 3 | -4/+4 |
| | | | |||||
* | | | use update.key instead of update.ast.key. make better use of select manager. | Jon Leighton | 2011-08-15 | 3 | -26/+18 |
| | | | |||||
* | | | Use a SelectCore rather than a full SelectManager | Jon Leighton | 2011-08-15 | 2 | -4/+6 |
| | | | |||||
* | | | Refactor building the update manager | Jon Leighton | 2011-08-15 | 4 | -16/+13 |
| | | | |||||
* | | | Support for multi-table updates with limits, offsets and orders | Jon Leighton | 2011-08-15 | 3 | -2/+47 |
| | | | |||||
* | | | Support updates with joins. Fixes #522. | Jon Leighton | 2011-08-15 | 4 | -4/+26 |
| | | | |||||
* | | | Ensure empty has_many :through association preloaded via joins is marked as ↵ | Jon Leighton | 2011-08-15 | 1 | -3/+2 |
| | | | | | | | | | | | | loaded. Fixes #2054. | ||||
* | | | Fix private methods which are delegated to. This previously worked because ↵ | Jon Leighton | 2011-08-15 | 2 | -13/+13 |
|/ / | | | | | | | Module#delegate previously ignored method visibility. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | ||||
| * | | Document exclamation point on dynamic finders | Florent Guilleux | 2011-08-13 | 1 | -0/+4 |
| | | | |||||
| * | | accept option for recreate db for postgres (same as mysql now) | artemk | 2011-08-13 | 1 | -2/+4 |
| | | | |||||
| * | | initializing @open_transactions in the initialize method | Aaron Patterson | 2011-08-13 | 1 | -4/+2 |
| | | | |||||
| * | | add a migrate class method and delegate to the new instance | Aaron Patterson | 2011-08-13 | 1 | -1/+4 |
| | | | |||||
| * | | Support backwards compatible interface for migration down/up with rails 3.0.x. | Christopher Meiklejohn | 2011-08-13 | 1 | -0/+1 |
| | | | |||||
| * | | default writing the schema file as utf-8 | Aaron Patterson | 2011-08-13 | 1 | -1/+2 |
| | | | |||||
| * | | dump IO encoding value along with schema.rb so the file can be reloaded. ↵ | Aaron Patterson | 2011-08-13 | 1 | -0/+4 |
| | | | | | | | | | | | | fixes #1592 | ||||
| * | | Revert "Merge pull request #2309 from smasry/master" | Jon Leighton | 2011-08-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d. Reason: the change broke the build. | ||||
| * | | Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697 | Samer Masry | 2011-08-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed failing query when performing calculation with having based on select. | Dmitriy Kiriyenko | 2011-08-13 | 1 | -0/+1 |
| | | | |||||
| * | | Add a proxy_association method to association proxies, which can be called ↵ | Jon Leighton | 2011-08-13 | 2 | -6/+16 |
| | | | | | | | | | | | | by association extensions to access information about the association. This replaces proxy_owner etc with proxy_association.owner. |