1b27f5c4f72384081083fa025b6b10e5ab02ae5e Will will@makisu.local http://github.com/rails/rails/commit/bf6af5f71917b5615edb5905729b22772133eea4 bf6af5f71917b5615edb5905729b22772133eea4 2009-12-16T08:49:53-08:00 2009-12-16T08:49:06-08:00 When passing force_reload = true to an association, don't use the query cache [#1827 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> 5a7a3d79c7f9288ac52151acbef7be45e1171f7a Joshua Peek josh@joshpeek.com d0aa0cfbd76a919e536e76d65419930fb7fe31da Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/78790e47b8603917e2f2352f973a2de7769cb74b 78790e47b8603917e2f2352f973a2de7769cb74b 2009-11-23T10:42:32-08:00 2009-11-23T10:05:35-08:00 Revert "Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted."" This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae. [#3128 state:resolved] Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb 12e6eb6a7c87c7ee85f9c961eefe8b685b69402c Jeremy Kemper jeremy@bitsweat.net fb61fbd35229154f4ced124568697878822336cb Gabe da Silveira gabe@websaviour.com http://github.com/rails/rails/commit/ea290e77e6c50b13a0c9000eceaa5412de6918bc ea290e77e6c50b13a0c9000eceaa5412de6918bc 2009-11-17T22:25:40-08:00 2009-11-17T09:36:23-08:00 Insert generated association members in the same order they are specified when assigning to a has_many :through using the generated *_ids method [#3491 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> c23082de62d9e48b11ce23ad3ce01e674f9d8295 Jeremy Kemper jeremy@bitsweat.net 3f54f3100b6c262776ad324bd649ff268600e280 Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/7b3d85db4c58e2f719981efd6ef5a6b870f6ab49 7b3d85db4c58e2f719981efd6ef5a6b870f6ab49 2009-11-13T15:30:51-08:00 2009-11-13T15:30:51-08:00 Revert "Split arel_table into method to get a relation and another to memoize the default relation." This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068. 571b86ca825c9fb09118c43449cf3f4fb50d2f32 Jeremy Kemper jeremy@bitsweat.net 0da71980cd61aa6297749d0ea8520785c9a5280f Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/bd51790895fc75a3b4e19e8dd7aa6dc389d77068 bd51790895fc75a3b4e19e8dd7aa6dc389d77068 2009-11-13T10:53:19-08:00 2009-11-13T10:44:34-08:00 Split arel_table into method to get a relation and another to memoize the default relation. ef3ccd2dcfd84f618116b99bc2ede21b69b2ccf5 Jeremy Kemper jeremy@bitsweat.net 18d497651628c73287f3e808c3807121ad36e278 Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/fbbf0086ca8f13f76d2969f655bb1bfc2f4eb4d6 fbbf0086ca8f13f76d2969f655bb1bfc2f4eb4d6 2009-11-13T09:52:53-08:00 2009-11-12T17:21:41-08:00 Ruby 1.9.2: avoid #flatten c7d6b1be9e5ea22756a761a49da0609f579b5b90 Jeremy Kemper jeremy@bitsweat.net 11e798ae0f2f46498811282756c9d21df3d4b523 Matt Jones al2o3cr@gmail.com http://github.com/rails/rails/commit/d625312fe11bbf53e285a0efd570249f0bf91fd1 d625312fe11bbf53e285a0efd570249f0bf91fd1 2009-11-09T21:41:37-08:00 2009-11-07T11:00:54-08:00 delete correct records for a has_many with :primary_key and :dependent => :delete_all Signed-off-by: Michael Koziarski <michael@koziarski.com> 9ded25037ea44d55e11abb4e84a174694f99a350 Michael Koziarski michael@koziarski.com 36a9644b86c53e322a891669cbdd2cf62cd648ac Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/e93c2da14108c324ddf5f08f0165b342e028896f e93c2da14108c324ddf5f08f0165b342e028896f 2009-11-02T17:50:12-08:00 2009-11-02T17:49:37-08:00 Arel::In -> Arel::Predicates::In fd074c050053899fabdc13bc273764a197afd9e9 Jeremy Kemper jeremy@bitsweat.net 9a71b6d29d013d8ee3f0d3f408d53e1cf3c9f799 65f055a3ed790d41aeca8d4ca7f3771b05cf544f Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/1daceeb838dccfd47547dedea67eb22e7c06c5a9 1daceeb838dccfd47547dedea67eb22e7c06c5a9 2009-10-05T11:25:06-07:00 2009-10-05T11:25:06-07:00 Merge branch 'associations_2' 506ad932a341befbbea1d4ea719d992ef22f3512 Emilio Tagua miloops@gmail.com 3747f896a1b727d67e6022001007e5f58b24a267 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/65f055a3ed790d41aeca8d4ca7f3771b05cf544f 65f055a3ed790d41aeca8d4ca7f3771b05cf544f 2009-10-05T11:24:08-07:00 2009-10-05T11:24:08-07:00 Added eager loading support to Relation and ActiveRecord#all. fa82844e2b1734fee8297ec683811b073a8312f0 Emilio Tagua miloops@gmail.com 5f9540e4830ace3459b4018006573bad7fb30b53 420004e030e96f2ace6e27fd622c90ee9e986677 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/29457a21c0d4451f5dbc66f72b8256baa02a55bd 29457a21c0d4451f5dbc66f72b8256baa02a55bd 2009-10-02T06:52:55-07:00 2009-10-02T06:52:55-07:00 Merge commit 'rails/master' 50aebb7b31b990b805871e816b852151df2833a1 Emilio Tagua miloops@gmail.com d48ebeade2d907573e3fb086495b57b10115066c Luciano G Panaro contact@decodeuri.com http://github.com/rails/rails/commit/4168f876238982d0d584006f50188071928a8b7f 4168f876238982d0d584006f50188071928a8b7f 2009-09-27T18:50:33-07:00 2009-09-26T06:33:50-07:00 Make has_one with :conditions hash scope build or creation of the associated object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed] 93e22b323a8f3bf25c5e67697a347e1fb958b0a0 Michael Koziarski michael@koziarski.com 0489f0c582d2ab70595296f058545b102466bebd 181cd109d9812d371e2d554a4846f0b2b25b1690 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/24260dc0c8338aef8e24407e00750fd72a0366ea 24260dc0c8338aef8e24407e00750fd72a0366ea 2009-09-14T05:47:55-07:00 2009-09-14T05:47:55-07:00 Merge commit 'rails/master' 849b286decba65c1136947ef6f52235335df2383 Emilio Tagua miloops@gmail.com 65f98951ac5fe75191c6fde996b9e0f9b765414f Eloy Duran eloy.de.enige@gmail.com http://github.com/rails/rails/commit/580ec0dccde075330abe68eb13badb03b225f9b4 580ec0dccde075330abe68eb13badb03b225f9b4 2009-09-12T07:04:25-07:00 2009-07-11T12:01:56-07:00 Added some documentation about setting :autosave => false on an association. e8d3046fc23f1ac5ca4b355eded5e2ebd63a8f29 Eloy Duran eloy.de.enige@gmail.com 670281c6b2e9b9e8c51a140f2a5f66b251f1b84b af5b12c64c878f08336d38e91cc64137a30fb8da Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/0489f0c582d2ab70595296f058545b102466bebd 0489f0c582d2ab70595296f058545b102466bebd 2009-09-08T11:39:33-07:00 2009-09-08T11:39:33-07:00 Merge commit 'rails/master' 159a85dda7bdb652c93cc05a7ab422283c9f3035 Emilio Tagua miloops@gmail.com 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 1a0f822037c408a392ffa7b6e1ecbe5951ab48db Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/670281c6b2e9b9e8c51a140f2a5f66b251f1b84b 670281c6b2e9b9e8c51a140f2a5f66b251f1b84b 2009-09-08T11:38:51-07:00 2009-09-08T11:38:51-07:00 Merge commit 'rails/master' Conflicts: activerecord/lib/active_record/associations.rb ab141872d72e010c8a0fe371d22a00914c97e1eb Emilio Tagua miloops@gmail.com aeab739bd56c0bff6d1b5685eee35e557484ab4c José Valim jose.valim@gmail.com http://github.com/rails/rails/commit/4f37b97033f596ec2c95eb53e9964e051c224981 4f37b97033f596ec2c95eb53e9964e051c224981 2009-09-08T08:26:39-07:00 2009-09-08T08:10:14-07:00 Changed ActiveRecord to use new callbacks and speed up observers by only notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com> b7dd859f4d1b1835178eec795711f8619963c23c Joshua Peek josh@joshpeek.com 723a47bfb3708f968821bc969a9a3fc873a3ed58 Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/3b6a9a020e7e6f71ab6f9ffcf1ef59c57437ca69 3b6a9a020e7e6f71ab6f9ffcf1ef59c57437ca69 2009-09-02T13:55:47-07:00 2009-09-02T13:55:02-07:00 Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81. 90df5808a8788bf48c1079989d0171495a75e0d6 Jeremy Kemper jeremy@bitsweat.net 6b67df70ab1bc42d9a05571144cdf5614a7d4a6a da636809daca9c338200811d3590e446f57c8e81 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/39e4e76d15233bb1cb0b778d920f54efe86bb4f0 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 2009-09-01T11:45:43-07:00 2009-09-01T11:45:43-07:00 Merge commit 'rails/master' Conflicts: activerecord/lib/active_record/associations.rb 7e9cab343139c79acc36715f4f24c579a207fbc6 Emilio Tagua miloops@gmail.com c5f6e038daf2221ddd5a7534e68f4158d84a5975 José Valim jose.valim@gmail.com http://github.com/rails/rails/commit/da636809daca9c338200811d3590e446f57c8e81 da636809daca9c338200811d3590e446f57c8e81 2009-09-01T10:15:23-07:00 2009-09-01T04:11:15-07:00 Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted. [#3128 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> ac2a678c61836fa695542343591fbbc145c3d7d5 Jeremy Kemper jeremy@bitsweat.net 54fcbb881d1d707d65d38cd30f50049023448832 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/a60334fdc5d4f612bd2dd70e38d1e57481cd5910 a60334fdc5d4f612bd2dd70e38d1e57481cd5910 2009-08-19T15:36:06-07:00 2009-08-19T15:36:06-07:00 Remove useless conditionals/local var. a3644d3db7bf0c2f8c7766ad7793e5a2a74ee010 Emilio Tagua miloops@gmail.com b32474020c4ec2f2b9c78bd580466c494eac6eb3 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/54fcbb881d1d707d65d38cd30f50049023448832 54fcbb881d1d707d65d38cd30f50049023448832 2009-08-19T13:45:13-07:00 2009-08-19T13:45:13-07:00 Make sure join association methods are called once. ed904ffbcf5f6d60cea2ffa00fc95062ea498aa3 Emilio Tagua miloops@gmail.com ccf5f2c4a20a9a275dd86f251fa026eee7f344c5 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/b32474020c4ec2f2b9c78bd580466c494eac6eb3 b32474020c4ec2f2b9c78bd580466c494eac6eb3 2009-08-19T12:29:26-07:00 2009-08-19T12:29:26-07:00 Don't sanitize_sql where it doesn't make sense. c38c24619c5f2d75db3b55a46f77cdbe87465abb Emilio Tagua miloops@gmail.com 3e1ef198e086deb4f212523ce2338a027f0e4155 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/ccf5f2c4a20a9a275dd86f251fa026eee7f344c5 ccf5f2c4a20a9a275dd86f251fa026eee7f344c5 2009-08-19T12:17:16-07:00 2009-08-19T12:17:16-07:00 Remove old method and comment. 7c49d6805f7c685c563c73e2334c9b9897a2eabc Emilio Tagua miloops@gmail.com b3427286771bb476c0c4a58488033bd671740332 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/3e1ef198e086deb4f212523ce2338a027f0e4155 3e1ef198e086deb4f212523ce2338a027f0e4155 2009-08-19T12:08:54-07:00 2009-08-19T12:08:54-07:00 Remove useless InnerJoinDependency, inner joins are performed through Arel::InnerJoin. 9f6311d7fcc0a00b11a93b3791124d5452007364 Emilio Tagua miloops@gmail.com c36cfa7568cd51718d149107696e779d3282da45 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/2048556a14c28f9814f9c6ad44a08084afec1afe 2048556a14c28f9814f9c6ad44a08084afec1afe 2009-08-19T07:09:12-07:00 2009-08-19T07:09:12-07:00 Remove whitespace. f61108308297a072478df3754215b897bbc0796c Emilio Tagua miloops@gmail.com ac03bc91dbee36233e061eb624f7781a49ab6fcf Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/66fbcc1de646129a3fc7415aa2f8416ef78d8cbb 66fbcc1de646129a3fc7415aa2f8416ef78d8cbb 2009-08-18T10:10:03-07:00 2009-08-18T10:10:03-07:00 Use immutable relation objects to generate queries. 58012f2b522159e34a6a751b2584e24f1d3ca05a Emilio Tagua miloops@gmail.com c923409630a92d1a935699c1427702c822601165 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/79e951ca9bc875da9e4a19adeff3634f0b5b7b76 79e951ca9bc875da9e4a19adeff3634f0b5b7b76 2009-08-18T03:50:11-07:00 2009-08-18T03:50:11-07:00 Use finder options as relation method names to provide more familiar naming. Use bang methods convention in methods that alter the relation. 3b46a3061cea3bc6a1d7a72d9e6f5c793a56663b Emilio Tagua miloops@gmail.com 4b339f44bdaa307004db2345ac9c950d9f508814 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/c923409630a92d1a935699c1427702c822601165 c923409630a92d1a935699c1427702c822601165 2009-08-17T16:17:40-07:00 2009-08-17T16:17:40-07:00 Clean up relation joins when finding records with included associations. 3af73ff745095a0c4ebfcb4a6a813d1c532cc4a2 Emilio Tagua miloops@gmail.com b68ef73344003949e302d784ff3cca6a95192ce0 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/9ac01fad193b27e517ea772e0d1e13e06f4ddf34 9ac01fad193b27e517ea772e0d1e13e06f4ddf34 2009-08-14T08:33:05-07:00 2009-08-14T08:33:05-07:00 Use ARel's joins when building a query for finding records with included associations. 87182ceef9887c04ce77c37decdbea408c1e1ebb Emilio Tagua miloops@gmail.com eb3ae44ccaff1dc63eb31bf86d8db07c88ddc413 600a89f2082beadf4af9fe140a1a2ae56386cd49 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/0e2fbd80e2420329738b891240d44a056cea1de4 0e2fbd80e2420329738b891240d44a056cea1de4 2009-08-10T14:07:33-07:00 2009-08-10T14:07:33-07:00 Merge commit 'rails/master' Conflicts: activerecord/lib/active_record/calculations.rb activerecord/lib/active_record/connection_adapters/mysql_adapter.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb 5b16755670be58e168b5e86e2cdcb43ee5aa3918 Emilio Tagua miloops@gmail.com 810b59a2a9da3e85bc85d2617ae781c1b3645af4 Gabe da Silveira gabe@websaviour.com http://github.com/rails/rails/commit/00d6c766608f90ce64f11feb98786cbc7f71b89d 00d6c766608f90ce64f11feb98786cbc7f71b89d 2009-08-09T16:30:44-07:00 2009-08-09T12:53:22-07:00 Enable has_many :through for going through a has_one association on the join model [#2719 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> facb90eba8022d93b0cc9c3aba566694617ce583 Pratik Naik pratiknaik@gmail.com f16008afddaf7d80d6bac0ace380e864b78106fe Dmitry Ratnikov ratnikov@gmail.com http://github.com/rails/rails/commit/314ba0433f03b66022ad41d55cc75d2bd9809fe3 314ba0433f03b66022ad41d55cc75d2bd9809fe3 2009-08-09T02:52:06-07:00 2009-08-09T01:48:49-07:00 Changed to use klass instead of constantizing in assign_ids generated method [#260 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 97437c9e2e9e4b1884abd51972f7d78e6218d69c Jeremy Kemper jeremy@bitsweat.net 0d539947017e0ba04601889e2a3e01a64bcadf69 Rich Bradley richbradley@gmail.com http://github.com/rails/rails/commit/9bb8ef9edebf5c27b8a1c67ca3776d52afbc1dc4 9bb8ef9edebf5c27b8a1c67ca3776d52afbc1dc4 2009-08-09T00:31:46-07:00 2009-08-08T23:29:38-07:00 Fix for nested :include with namespaced models. [#260 state:committed] fa7154082c74f53d2441407786ce72ecb68903da Jeremy Kemper jeremy@bitsweat.net d469ad8a49779b3f3d6711989bb334534e94f099 Emilio Tagua miloops@gmail.com http://github.com/rails/rails/commit/ae9e1e9f6d08bbd5f5c1512b72d495168e9fa5e5 ae9e1e9f6d08bbd5f5c1512b72d495168e9fa5e5 2009-08-07T13:55:36-07:00 2009-08-07T13:55:36-07:00 Removed unused methods. 031c24af77f39c85368b00529355ff6e24b87b84 Emilio Tagua miloops@gmail.com