aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-sec'Aaron Patterson2012-05-313-3/+37
|\ | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-3/+37
| | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661
* | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
| |
* | Fix changelog example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
| | | | | | | | Missed that too, thanks again @splattael.
* | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
| | | | | | | | Thanks @splattael.
* | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-05-311-0/+1
| |
* | Fix backward compatibility with stored Hash values. Wrap coders to convert ↵Jeremy Kemper2012-05-303-15/+51
| | | | | | | | serialized values to indifferent access.
* | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ \ | | | | | | Properly discover a connection is closed in postgresql_adapter
| * | Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PQstatus doesn't properly test if future operations will succeed. A PQping function is added to libpq in PostgreSQL 9.1, but if we rely on it, everyone on earlier versions of Postgres is out of luck, and the pg gem wouldn't have the 'fix' until the next release. Thanks to @cbrecabarren and @ged for handling all the dirty details. Closes #3392.
* | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|\ \ \ | | | | | | | | Fix #5797. Error calling dup method on AR model with serialized field
| * | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-304-5/+15
| | | |
* | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-307-33/+123
|\ \ \ \ | | | | | | | | | | Fix logs name consistency.
| * | | | Fix logs name consistency.kennyj2012-05-197-33/+123
| | | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-305-27/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| | | | |
| * | | | change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| | | | |
| * | | | Adds to Batch processing documentation [ci skip]Alvaro Pereyra2012-05-281-9/+20
| | | | |
| * | | | fix typo and remove 'examples' noise [ci skip]Francesco Rodriguez2012-05-281-18/+6
| | | | |
| * | | | Updates examples for FinderMethods [ci skip]Alvaro Pereyra2012-05-281-2/+14
| | | | |
| * | | | Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-2840-99/+798
| |\ \ \ \
| | * \ \ \ Merge pull request #102 from xenda/masterXenda2012-05-271-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | Small fix to update the README using more up to date conventions.
| | * | | | | "a sql" -> "an SQL" per API documentation guidelinesMark Rushakoff2012-05-271-1/+1
| | | | | | |
| * | | | | | Adds examples to FinderMethods#first [ci skip]Alvaro Pereyra2012-05-281-0/+1
| | |/ / / / | |/| | | |
| * | | | | Updates validations examples to be more attuned on the new Rails 3.0 conventionsAlvaro Pereyra2012-05-281-4/+4
| | | | | |
* | | | | | Fix #5847 and #4045 on master.kennyj2012-05-301-0/+2
| | | | | |
* | | | | | Use runner hook to load ActiveRecord::Base.kennyj2012-05-301-0/+4
| | | | | |
* | | | | | SchemaMigration should be loaded lazily.kennyj2012-05-293-2/+1
| | | | | |
* | | | | | Add tests to delete by fixnum or string id with has many through associationsFrancesco Rodriguez2012-05-281-0/+20
| | | | | |
* | | | | | Fix failing build related to change in CollectionAssociation#deleteCarlos Antonio da Silva2012-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e
* | | | | | Yield only one argument instead of splatting.Carlos Antonio da Silva2012-05-282-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Add Changelog entry. Closes #4003
* | | | | | Allow blocks for count with ActiveRecord::Relation. Document and test that ↵chrisfinne2012-05-282-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | sum allows blocks
* | | | | | Add support for CollectionAssociation#delete by Fixnum or StringFrancesco Rodriguez2012-05-284-3/+57
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found the next issue between CollectionAssociation `delete` and `destroy`. class Person < ActiveRecord::Base has_many :pets end person.pets.destroy(1) # => OK, returns the destroyed object person.pets.destroy("2") # => OK, returns the destroyed object person.pets.delete(1) # => ActiveRecord::AssociationTypeMismatch person.pets.delete("2") # => ActiveRecord::AssociationTypeMismatch Adding support for deleting with a fixnum or string like `destroy` method.
* | | | | remove unnecessary ruby 1.8 reference from active_record/core [ci skip]Francesco Rodriguez2012-05-261-3/+4
| | | | |
* | | | | add CollectionProxy#uniq documentationFrancesco Rodriguez2012-05-261-0/+21
| | | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-2/+188
|\ \ \ \ \
| * | | | | add :nodoc: to CollectionProxy#initializeFrancesco Rodriguez2012-05-251-1/+1
| | | | | |
| * | | | | add CollectionProxy#== documentationFrancesco Rodriguez2012-05-251-0/+24
| | | | | |
| * | | | | add CollectionProxy#count documentationFrancesco Rodriguez2012-05-251-0/+26
| | | | | |
| * | | | | add CollectionProxy#to_ary documentationFrancesco Rodriguez2012-05-251-2/+35
| | | | | |
| * | | | | add CollectionProxy#delete documentationFrancesco Rodriguez2012-05-251-1/+104
| | | | | |
* | | | | | Merge pull request #4132 from Juanmcuello/clone_structureAaron Patterson2012-05-251-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reset postgreSQL search path in db:test:clone_structure.
| * | | | | | Reset postgreSQL search path in db:test:clone_structure.Juan M. Cuello2011-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945
* | | | | | | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-05-251-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove prepared statement from system query in postgresql adapter
| * | | | | | | Remove prepared statement from system query in postgresql adapterIvan Evtukhovich2012-05-121-10/+10
| | | | | | | |
* | | | | | | | Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Maximum wait_timeout on Windows is 2147483
| * | | | | | | | Maximum wait_timeout on Windows is 2147483Fotos Georgiadis2012-03-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Quote arguments in db:structure:dump for PostgreSQL.
* | | | | | | | Whitespaces :scissors:Rafael Mendonça França2012-05-232-7/+7
| | | | | | | |
* | | | | | | | PGconn doesn't accepts :checkout_timeout option.Rafael Mendonça França2012-05-231-1/+1
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e renaming the :wait_timeout option. Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-233-34/+463
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 06:09:25 +0000