aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5453 from ↵Aaron Patterson2012-05-161-2/+6
|\ | | | | | | | | JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded When Active Record has already loaded a unique association `.size` returns the wrong number.
| * when using a preloaded array and the uniq flag is set then return the size ↵Jon Rowe2012-03-151-2/+6
| | | | | | | | of the uniq array
* | Merge pull request #6358 from jfirebaugh/schema_defineAaron Patterson2012-05-161-7/+10
|\ \ | | | | | | Call methods on the correct instance in AR::Schema.define
| * | Call methods on the correct instance in AR::Schema.defineJohn Firebaugh2012-05-161-7/+10
| | | | | | | | | | | | | | | Now that migrations support instance methods, we should use the same instance rather than relying on delegation to a global instance. This allows subclassing AR::Schema.
* | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-161-0/+2
| | |
* | | Merge pull request #6192 from ↵Aaron Patterson2012-05-163-7/+65
|\ \ \ | | | | | | | | | | | | | | | | danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter
| * | | Removes NetAddr dependencyDan McClain2012-05-081-6/+7
| | | |
| * | | Converts inet and cidr columns to NetAddr::CIDRDan Seaver2012-05-073-3/+41
| | | |
| * | | Adds migration and schema dump support for INET, CIDR, and MACADDRDan Seaver2012-05-051-4/+23
| | | |
* | | | Merge pull request #5535 from markmcspadden/issue_5527_rollbacksAaron Patterson2012-05-161-1/+9
|\ \ \ \ | |_|/ / |/| | | Allow manual rollbacks in after_save to reset object correctly
| * | | Allow manual rollbacks in after_save to reset object correctlyMark McSpadden2012-03-211-1/+9
| | | |
* | | | assuming there is only one column, we can simplify the type cast loopAaron Patterson2012-05-161-7/+6
| | | |
* | | | MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unlessAaron Patterson2012-05-161-4/+11
| | | | | | | | | | | | | | | | | | | | an alias is provided. Without the alias, the column cannot be found and properly typecast.
* | | | Merge pull request #6136 from mhfs/sqlbypass_fixesAaron Patterson2012-05-161-5/+10
|\ \ \ \ | | | | | | | | | | Bring SqlByPassTest to light and fix broken tests
| * | | | Rename test file so that the test suite matches it, implement `persisted?` ↵Marcelo Silveira2012-05-161-5/+10
| | | | | | | | | | | | | | | | | | | | for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
* | | | | Merge pull request #6349 from erichmenge/patch-raise-type-errorsAaron Patterson2012-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Integer limit out of range should be allowed to raise. Closes #6272
| * | | | | Integer limit out of range should be allowed to raise. Closes #6272Erich Menge2012-05-161-1/+1
| |/ / / /
* | | | | Merge pull request #6336 from erichmenge/patch-pluck-fragmentCarlos Antonio da Silva2012-05-161-8/+3
|\ \ \ \ \ | | | | | | | | | | | | Fixes issue where SQL fragments prevented type casting based on column
| * | | | | Fixes issue where SQL fragments prevented type casting based on column type.Erich Menge2012-05-161-8/+3
| |/ / / /
* | | | | Merge pull request #6344 from erichmenge/patch_sqlite_time_typePiotr Sarnacki2012-05-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | SQLite3 doesn't actually support the 'time' type.
| * | | | | SQLite3 doesn't actually support the 'time' type.Erich Menge2012-05-151-1/+1
| |/ / / /
* / / / / Remove useless check of adapterOscar Del Ben2012-05-151-4/+0
|/ / / /
* | | | Remove unnecessary calls to primary_key on sqlite3_adapterCarlos Galdino2012-05-151-1/+1
| | | |
* | | | Expand and improve #pluck docsJeremy Kemper2012-05-151-6/+27
| | | |
* | | | Restore support for Model.pluck('sql fragment')Jeremy Kemper2012-05-151-1/+2
| | | |
* | | | Remove extra `end` in arel_table docs. [ci skip]Carlos Antonio da Silva2012-05-151-8/+6
| | | | | | | | | | | | | | | | Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | | Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
| | | | |
* | | | | Set the primary key during #copy_table if necessary. Fixes [#2312]Sean Scally2012-05-141-1/+5
| | | | |
* | | | | Copy edit [ci skip]Rafael Mendonça França2012-05-131-3/+4
| | | | |
* | | | | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-131-5/+10
|\ \ \ \ \ | | | | | | | | | | | | Custom coders support for ActiveRecord::Store.
| * | | | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵Andrey Voronkov2012-05-091-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | used out of the box.
* | | | | | fixes a nodoc which swallowed the documentation for the rest of the methods ↵Vijay Dev2012-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #6285 from ↵Vijay Dev2012-05-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter
| * | | | | missplelling error in abstract_mysql_adapterAngelo Capilleri2012-05-121-1/+1
| | | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-123-6/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | | | copy edits [ci skip]Vijay Dev2012-05-121-4/+1
| | | | | | |
| * | | | | | Better document the difference between #clone and #dup.Erich Menge2012-05-111-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235
| * | | | | | better wordingHrvoje Šimić2012-05-111-4/+4
| | | | | | |
| * | | | | | missing 'with'Hrvoje Šimić2012-05-111-1/+1
| | |/ / / / | |/| | | |
* | | | | | s/wether/whether [ci skip]Vijay Dev2012-05-121-1/+1
| | | | | |
* | | | | | Remove #=== quirkJon Leighton2012-05-111-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this.
* | | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
| | | | | |
* | | | | | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
| | | | | |
* | | | | | extract deprecated codeJon Leighton2012-05-111-8/+1
| | | | | |
* | | | | | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
| | | | | |
* | | | | | CollectionProxy < RelationJon Leighton2012-05-116-51/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps bring the interfaces of CollectionProxy and Relation closer together, and reduces the delegation backflips we need to perform. For example, first_or_create is defined thus: class ActiveRecord::Relation def first_or_create(...) first || create(...) end end If CollectionProxy < Relation, then post.comments.first_or_create will hit the association's #create method which will actually add the new record to the association, just as post.comments.create would. With the previous delegation, post.comments.first_or_create expands to post.comments.scoped.first_or_create, where post.comments.scoped has no knowledge of the association.
* | | | | | Return false for exists? with new records - fixes #6199.Andrew White2012-05-101-2/+1
| | | | | |
* | | | | | remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
| | | | | |
* | | | | | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-091-79/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename variables and remove unused code in fixtures.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:31:36 +0000