Akira Matsuda
37a4dd5ccf
a test case that ensures AR::Relation#merge can merge associations
2012-06-03 13:28:01 +09:00
Xavier Noria
afcc7cc301
minor comment revision
2012-06-01 16:57:58 +02:00
Rafael Mendonça França
3449b757da
Sync CHANGLOG with the 3-2-stable branch
2012-06-01 11:41:30 -03:00
Akira Matsuda
c1ea574b27
improve readability of AR explain result
2012-06-01 17:05:52 +09:00
Akira Matsuda
c8882c1a40
unused method arguments
2012-06-01 14:46:21 +09:00
Akira Matsuda
212a74d8b7
modulize AR::NullRelation
...
now we can invoke previously added scope extension methods
2012-06-01 14:46:13 +09:00
Aaron Patterson
5f91ea3dc1
Merge branch 'master-sec'
...
* 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
2012-05-31 11:25:19 -07:00
Jeremy Kemper
5f690b97ba
Psych is always available on 1.9
2012-05-31 10:01:59 -07:00
Carlos Antonio da Silva
c51fb02406
Fix changelog example for count method with block [ci skip]
...
Missed that too, thanks again @splattael.
2012-05-31 10:10:12 -03:00
Carlos Antonio da Silva
959a36084a
Fix wrong example for count method with block [ci skip]
...
Thanks @splattael.
2012-05-31 10:07:43 -03:00
Jeremy Kemper
08477a6516
Work around undiagnosed bug that's draining a relation's bind_values
2012-05-31 00:47:50 -07:00
Jeremy Kemper
d5354af114
Fix backward compatibility with stored Hash values. Wrap coders to convert serialized values to indifferent access.
2012-05-30 23:21:57 -07:00
Aaron Patterson
9340f89849
predicate builder should not recurse for determining where columns.
...
Thanks to Ben Murphy for reporting this
CVE-2012-2661
2012-05-30 15:09:13 -07:00
Rafael Mendonça França
c56ef67705
Merge pull request #6477 from steveklabnik/close_discovered_pg_connection
...
Properly discover a connection is closed in postgresql_adapter
2012-05-30 13:43:11 -07:00
Aaron Patterson
1b075220ef
Merge pull request #5810 from kennyj/fix_5797
...
Fix #5797 . Error calling dup method on AR model with serialized field
2012-05-30 11:26:59 -07:00
Aaron Patterson
7c1b61e50e
Merge pull request #6386 from kennyj/fix_logs_name_consistency
...
Fix logs name consistency.
2012-05-30 11:06:49 -07:00
Vijay Dev
ec74763c39
Merge branch 'master' of github.com:lifo/docrails
2012-05-30 22:53:52 +05:30
Vijay Dev
032f502f12
copy edit the batches docs [ci skip]
2012-05-30 22:40:51 +05:30
kennyj
d09b2fd09d
Fix #5797 . Error calling dup method on AR model with serialized field
2012-05-30 23:24:23 +09:00
kennyj
c0ba0f01d0
Fix #5847 and #4045 on master.
2012-05-30 00:27:43 +09:00
kennyj
cc7dd66c68
Use runner hook to load ActiveRecord::Base.
2012-05-30 00:27:38 +09:00
kennyj
5cc9c7e369
SchemaMigration should be loaded lazily.
2012-05-29 22:32:15 +09:00
Francesco Rodriguez
b89553cf41
Add tests to delete by fixnum or string id with has many through associations
2012-05-28 22:31:41 -05:00
Carlos Antonio da Silva
18af5dab07
Fix failing build related to change in CollectionAssociation#delete
...
Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e
2012-05-29 00:18:43 -03:00
Carlos Antonio da Silva
f9cb645dfc
Yield only one argument instead of splatting.
...
Add Changelog entry. Closes #4003
2012-05-28 23:16:34 -03:00
chrisfinne
9cc2bf69ce
Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks
2012-05-28 23:16:07 -03:00
Francesco Rodriguez
39f0698405
Add support for CollectionAssociation#delete by Fixnum or String
...
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.
2012-05-28 19:57:43 -05:00
Francesco Rodriguez
501d98b812
change example on CollectionProxy#delete to accept multiple values
2012-05-28 10:41:42 -05:00
Alvaro Pereyra
2bef137d99
Adds to Batch processing documentation [ci skip]
2012-05-28 03:24:37 -05:00
Francesco Rodriguez
a3d18d2ec0
fix typo and remove 'examples' noise [ci skip]
2012-05-28 02:55:11 -05:00
Alvaro Pereyra
19de3d8d7f
Updates examples for FinderMethods [ci skip]
2012-05-28 02:52:11 -05:00
Alvaro Pereyra
72973a3070
Merge branch 'master' of github.com:lifo/docrails
2012-05-28 02:29:46 -05:00
Alvaro Pereyra
011863673a
Adds examples to FinderMethods#first [ci skip]
2012-05-28 02:29:01 -05:00
Alvaro Pereyra
da4252f4a1
Updates validations examples to be more attuned on the new Rails 3.0 conventions
2012-05-28 01:45:33 -05:00
Xenda
fabd2ce24f
Merge pull request #102 from xenda/master
...
Small fix to update the README using more up to date conventions.
2012-05-27 23:42:52 -07:00
Mark Rushakoff
d138921cec
"a sql" -> "an SQL" per API documentation guidelines
2012-05-27 08:25:00 -07:00
Francesco Rodriguez
4df16f3f3d
remove unnecessary ruby 1.8 reference from active_record/core [ci skip]
2012-05-26 22:51:26 -05:00
Francesco Rodriguez
55c05276c7
add CollectionProxy#uniq documentation
2012-05-26 22:43:24 -05:00
Vijay Dev
575e77ba16
Merge branch 'master' of github.com:lifo/docrails
2012-05-26 17:49:59 +05:30
Francesco Rodriguez
7a323e2ed1
add :nodoc: to CollectionProxy#initialize
2012-05-25 23:09:47 -05:00
Francesco Rodriguez
bb55f52ee8
add CollectionProxy#== documentation
2012-05-25 23:01:38 -05:00
Francesco Rodriguez
f81798d064
add CollectionProxy#count documentation
2012-05-25 22:45:22 -05:00
Francesco Rodriguez
390d86ae89
add CollectionProxy#to_ary documentation
2012-05-25 22:18:56 -05:00
Francesco Rodriguez
29463aa15d
add CollectionProxy#delete documentation
2012-05-25 22:08:59 -05:00
Aaron Patterson
1ca31331ba
Merge pull request #4132 from Juanmcuello/clone_structure
...
Reset postgreSQL search path in db:test:clone_structure.
2012-05-25 17:03:21 -07:00
Aaron Patterson
0777773389
Merge pull request #5872 from evtuhovich/prepared_statement_fix
...
Remove prepared statement from system query in postgresql adapter
2012-05-25 10:38:13 -07:00
Rafael Mendonça França
1c3469b828
Merge pull request #5244 from fotos/myqsl2_wait_timeout
...
Maximum wait_timeout on Windows is 2147483
2012-05-25 12:00:00 -03:00
Carlos Antonio da Silva
6775ad8c61
Merge pull request #5925 from Juanmcuello/pg_structure_dump
...
Quote arguments in db:structure:dump for PostgreSQL.
2012-05-24 19:13:54 -03:00
Steve Klabnik
4dacac3baa
Properly discover a connection is closed in postgresql_adapter
...
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 .
2012-05-24 14:36:14 -04:00
Rafael Mendonça França
82b05fbcf4
Whitespaces ✂️
2012-05-23 15:32:05 -03:00