Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 52 | -101/+704 |
|\ | | | | | | | | | | | | | 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 | ||||
| * | Add tests for scoping schema_migrations index by global table prefix and suffix | Cristi Balan | 2009-08-09 | 1 | -0/+18 |
| | | | | | | | | | | | | [#1543 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Use table prefix and suffix for schema_migrations index. | Tim Peters | 2009-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | [#1543 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Introduce validates_with to encapsulate attribute validations in a class. | Jeff Dean | 2009-08-09 | 2 | -0/+69 |
| | | | | | | | | | | | | [#2630 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | PostgreSQL: XML datatype support | Leonardo Borges | 2009-08-09 | 6 | -25/+81 |
| | | | | | | | | | | | | [#1874 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | raises an exception on habtm join table inserts if join table contains a ↵ | Jaime Bellmyer | 2009-08-09 | 2 | -3/+26 |
| | | | | | | | | | | | | | | | | primary key. Caches this check to save time on subsequent inserts. [#2086 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | raises exception (ActiveRecord::ConfigurationError with message) on habtm ↵ | Jaime Bellmyer | 2009-08-09 | 7 | -0/+99 |
| | | | | | | | | | | | | association creation if join table contains a primary key Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix that creating a table whose primary key prefix type is :table_name ↵ | Morgan Schweers | 2009-08-09 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | generates an incorrectly pluralized primary key. [#872 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix test dependency on taggings | Jeremy Kemper | 2009-08-09 | 1 | -1/+2 |
| | | |||||
| * | Fix that counter_cache breaks with has_many :dependent => :nullify. | Gabe da Silveira | 2009-08-09 | 4 | -3/+32 |
| | | | | | | | | | | | | [#1196 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | AR should respect default values for MySQL BINARY and VARBINARY columns. | Jatinder Singh | 2009-08-09 | 2 | -2/+36 |
| | | | | | | | | | | | | [#1273 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | has_many :through create should not raise validation errors | railsbob | 2009-08-09 | 6 | -4/+45 |
| | | | | | | | | | | | | [#2934 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Allow ho:through#build when the owner is a new record [#1749 state:resolved] | Tristan Dunn | 2009-08-10 | 2 | -3/+19 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Prevent overwriting of table name in merging SQL conditions [#2949 ↵ | Tristan Dunn | 2009-08-10 | 3 | -2/+14 |
| | | | | | | | | state:resolved] | ||||
| * | Enable has_many :through for going through a has_one association on the join ↵ | Gabe da Silveira | 2009-08-10 | 7 | -6/+46 |
| | | | | | | | | | | | | model [#2719 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Removed duplicated tests [#3026 state:resolved] | Arthur Zapparoli | 2009-08-10 | 1 | -18/+0 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Model#human_attribute_name now accept symbols [#3025 status:resolved] | Arthur Zapparoli | 2009-08-09 | 2 | -1/+6 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Make sure association conditions work with :include and :joins [#358 ↵ | Vladimir Meremyanin | 2009-08-09 | 2 | -3/+11 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | No longer require database name for MySQL to allow cross database selects. | Tristan Dunn | 2009-08-09 | 2 | -6/+13 |
| | | | | | | | | | | | | [#1122 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Added back support for destroying an association's object by id. [#2306 ↵ | Joshua Nichols | 2009-08-09 | 2 | -0/+23 |
| | | | | | | | | | | | | status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | With multiparameter date attributes, the behaviour when empty fields are ↵ | Hugo Peixoto | 2009-08-09 | 2 | -6/+55 |
| | | | | | | | | | | | | | | | | present is now coherent with the one described in the date_select documentation. [#1715 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | validate uniqueness with limit in utf8 | Elise Huard | 2009-08-09 | 2 | -1/+11 |
| | | | | | | | | | | | | [#2653 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix standalone test missing developer fixture | Jeremy Kemper | 2009-08-09 | 1 | -1/+2 |
| | | |||||
| * | Added a uniqueness validation test that uses diacritics. | Hugo Peixoto | 2009-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | [#2883 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Allow connect_timeout, read_timeout and write_timeout settings for MySQL ↵ | Matt Conway | 2009-08-09 | 1 | -0/+4 |
| | | | | | | | | | | | | [#2544 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure hm:t#find does not assign nil to :include [#1845 state:resolved] | railsbob | 2009-08-09 | 2 | -1/+6 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Serialized attributes should only be saved with partial_updates when the ↵ | Mike Breen | 2009-08-09 | 2 | -1/+11 |
| | | | | | | | | | | | | serialized attribute is present [#2397 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Changed to use klass instead of constantizing in assign_ids generated method | Dmitry Ratnikov | 2009-08-09 | 2 | -13/+28 |
| | | | | | | | | | | | | [#260 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Modified Rich Bradley's test-case to fail as part of suite and with a ↵ | Dmitry Ratnikov | 2009-08-09 | 1 | -2/+16 |
| | | | | | | | | | | | | reasonable message Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix for nested :include with namespaced models. | Rich Bradley | 2009-08-09 | 3 | -2/+15 |
| | | | | | | | | [#260 state:committed] | ||||
| * | Don't define a default primary key in the schema dumper. | Tristan Dunn | 2009-08-08 | 2 | -1/+8 |
| | | | | | | | | | | | | [#1908 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix binary fixture test on Windows | Rob | 2009-08-08 | 1 | -1/+1 |
| | | | | | | | | | | | | [#2597 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | MySQL: fix diacritic uniqueness test by setting the default character set ↵ | Hugo Peixoto | 2009-08-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | and collation to utf8/utf8_unicode_ci [#2883 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Adding :from scoping to ActiveRecord calculations | Matt Duncan | 2009-08-09 | 3 | -0/+10 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1229 state:committed] | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-10 | 3 | -14/+26 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/migration.rb | ||||
| * | Ensure hm:t#create/create! throws ActiveRecord::RecordNotSaved when the ↵ | Pratik Naik | 2009-08-08 | 2 | -0/+11 |
| | | | | | | | | owner is new | ||||
| * | DRY migration's rollback/forward methods | Pratik Naik | 2009-08-08 | 1 | -14/+15 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-08-08 | 29 | -150/+452 |
|\| | | | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb activerecord/test/cases/method_scoping_test.rb | ||||
| * | Add rake db:forward - opposite of db:rollback [#768 state:resolved] | Cristi Balan | 2009-08-08 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | Example: rake db:forward # performs the next migration rake db:forward STEP=4 # performs the next 4 migrations Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Add test to verify that the new :inverse_of association option will indeed ↵ | Wolfram Arnold | 2009-08-08 | 2 | -0/+60 |
| | | | | | | | | | | | | | | | | fix the validation problem for a belongs_to relationship that validates_presence_of the parent, when both the parent and the child are new (in-memory) records. Also check that this works when the parents adds child via nested_attributes_for. Lastly, add a require 'models/pet' to association_validation_test.rb, so that test can be run independently (was failing due to that missing dependency). [#2815 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Tidy up the AR tests, removing duplicates and making tests clearer / more ↵ | Josh Sharpe | 2009-08-08 | 1 | -46/+11 |
| | | | | | | | | | | | | | | | | focussed. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2774 state:committed] | ||||
| * | Don't rely on T::U::TestCase#name | Jeremy Kemper | 2009-08-07 | 1 | -4/+5 |
| | | |||||
| * | Ruby 1.9.2: Object#id is gone now | Jeremy Kemper | 2009-08-07 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'oracle_enhanced' | Jeremy Kemper | 2009-08-07 | 23 | -113/+335 |
| |\ | |||||
| | * | Some databases (e.g. Oracle) does not allow "AS" between table name and ↵ | Raimonds Simanovskis | 2009-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | table alias name, for others it is optional | ||||
| | * | fixed test_foreign_key_violations_are_translated_to_specific_exception to ↵ | Raimonds Simanovskis | 2009-08-06 | 1 | -1/+7 |
| | | | | | | | | | | | | work with Oracle | ||||
| | * | modifications to Oracle connection.rb setup | Raimonds Simanovskis | 2009-08-06 | 1 | -3/+17 |
| | | | |||||
| | * | fix schema_dumper_test for Oracle as it supports precision up to 38 | Raimonds Simanovskis | 2009-08-06 | 2 | -2/+12 |
| | | | |||||
| | * | changed default connection to localhost orcl database | Raimonds Simanovskis | 2009-08-06 | 1 | -3/+3 |
| | | | |||||
| | * | always sort lists by id before comparison to avoid errors because of ↵ | Raimonds Simanovskis | 2009-08-06 | 1 | -1/+2 |
| | | | | | | | | | | | | different sorting of same results (on Oracle database) |