aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* [3-2-stable] Port of #5522 'Fix adding/removing field's index when ↵Marcelo Silveira2012-03-211-0/+3
| | | | generating migration'
* [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-201-1/+1
|
* Fix GH #5435. db:structure:dump should be re-enable.kennyj2012-03-181-0/+1
|
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
| | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
* ConnectionPool.checkout takes account of ruby using 'non-blocking condition ↵Jonathan Rochkind2012-03-131-9/+18
| | | | variables' in mutex ConditionVariables
* [3-2-stable] Fix GH #5399. connection_pools's keys are ↵kennyj2012-03-142-2/+8
| | | | ActiveRecord::Base::ConnectionSpecification objects.
* fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-132-1/+5
| | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API
* make sure connections returned after close are marked as in_useAaron Patterson2012-03-122-0/+26
|
* Merge pull request #5391 from jrochkind/connection_pool_docAaron Patterson2012-03-121-3/+1
|\ | | | | ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
| * inline docs for clear_active_connections! no longer says it cleans dead ↵Jonathan Rochkind2012-03-121-3/+1
| | | | | | | | threads, it doesn't since 3.2.0
* | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-121-0/+3
|/
* Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-127-1/+67
| | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb
* Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2José Valim2012-03-086-8/+43
|\ | | | | [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
| * Not need to pass join attributes to association buildRafael Mendonça França2012-03-085-16/+21
| |
| * Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-084-4/+34
| | | | | | | | | | | | | | | | :strict Conflicts: activerecord/test/models/person.rb
* | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-2/+11
|/ | | | Also add missing entries and use the formating convention
* ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
|
* make active_connection? return true only if there is an open connection in ↵Aaron Patterson2012-03-082-3/+46
| | | | use for the current thread. fixes #5330
* changelog updates [ci skip]Vijay Dev2012-03-091-0/+14
|
* Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-091-2/+2
|
* Add tests to test that through associations are not readonly, and we can ↵kuahyeow2012-03-081-0/+11
| | | | update the records we retrive from the association
* Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-072-1/+4
| | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
* Fix #5069 - Protect foreign key from mass assignment throught association ↵Jean Boussier2012-03-053-1/+40
| | | | builder
* Whitelist all attribute assignment by default.Michael Koziarski2012-03-052-0/+9
| | | | Change the default for newly generated applications to whitelist all attribute assignment. Also update the generated model classes so users are reminded of the importance of attr_accessible.
* Only run binary type cast test with encode! on Ruby 1.9Carlos Antonio da Silva2012-03-041-6/+8
|
* fix associations when using per class databasesLars Kanis2012-03-043-8/+5
| | | | | | would get ConnectionNotEstablished error because it always tried to use ActiveRecord::Base's connection, even though it should be using the connection of the model whose context we're operating in
* only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
| | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
* revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
| | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints both to table creation and modification. For creation the new default makes sense, but the generic situation for changing a table is that there exist records. Those records have no creation or modification timestamps, and in the general case you don't even know them, so when updating a table these constraints are not going to work. See a bug report for this use case in #3334.
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
| * bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
| |
| * Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
| | | | | | | | Fix usage of psql in db:test:prepare
| * updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
| |
* | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.kennyj2012-02-293-12/+23
| |
* | Revert "No need to pass options which is never used"Rafael Mendonça França2012-02-261-2/+2
| | | | | | | | | | | | | | | | | | Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c543451dce69403aaae047295758589d8e. Fixes #5052
* | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵Noah Hendrix2012-02-251-1/+1
| | | | | | | | itself instead of other_money.amount
* | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-231-1/+1
|/ | | | Fix usage of psql in db:test:prepare
* bumping up arelAaron Patterson2012-02-211-1/+1
|
* prepared statements can be disabledAaron Patterson2012-02-218-30/+56
|
* tag bind params with a bind param objectAaron Patterson2012-02-213-3/+3
|
* more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
|
* Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-212-19/+43
| | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
* Fix some warnings on 3-2-stablekennyj2012-02-211-1/+1
|
* fix test with ruby 187-p358Arun Agrawal2012-02-181-1/+5
|
* Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redoJosé Valim2012-02-141-1/+4
| | | | Always reenable _dump task in AR databases rake. Closes #5030
* Use real table and columns for index testRafael Mendonça França2012-02-081-3/+3
|
* Push proper test changes for previous commit conflicts.José Valim2012-02-081-2/+4
|
* Handle nil in add_index :length option in MySQLPaul Sadauskas2012-02-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output. Conflicts: activerecord/test/cases/migration/index_test.rb Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-073-0/+25
| | | | | | Conflicts: activerecord/lib/active_record/core.rb
* no need to check for this constantXavier Noria2012-02-071-1/+1
|
* Fixed the documenation for 'to_xml'Markus Fenske2012-02-071-1/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 03:45:23 +0000