aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* let automatic EXPLAIN ignore CACHE notificationsXavier Noria2012-02-032-1/+52
|
* Fix Issue #4819densya2032012-02-041-1/+1
| | | | | | 'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1' Just a typo of 'ActiveSupport::...'
* Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-023-17/+3
| | | | Fix for SQLite binary data corrupter (to master branch)
* Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-012-2/+13
| | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by
* Fix broken tests added by 85c724d59Rafael Mendonça França2012-01-313-13/+13
|
* Improve deprecation messageJon Leighton2012-01-311-7/+17
|
* Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
| | | | ids_reader method fixed, test added to has_many association (for PostgreSQL)
* Allow writing unknown attributes, but with a deprecation warning. Closes #4583.Jon Leighton2012-01-312-4/+14
|
* Add workaround and deprecation if the inherited hook is not executed. Closes ↵Jon Leighton2012-01-312-0/+22
| | | | #4757.
* Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
| | | | [MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
* query cache instrumentation should included the bindings in the payload ↵Xavier Noria2012-01-301-1/+1
| | | | [closes #4750]
* Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-272-1/+12
| | | | Fix regression from Rails 3.1
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-261-2/+6
|
* Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
|\ | | | | Remove extra attributes from HABTM join tables in AR tests
| * Remove extra attributes from HABTM join tables in AR testsRafael Mendonça França2012-01-261-2/+0
| | | | | | | | | | | | | | | | | | HABTM Join tables should not have extra attributes When extra attributes is needed in HABTM join tables is better to use `has_many :through` association. Fix #4653
* | registers 2483460 in the CHANGELOGXavier Noria2012-01-261-3/+5
| |
* | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-262-1/+17
|/
* call to_s on value passed to table_name=Sergey Nartimov2012-01-262-1/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix another race condition.Jon Leighton2012-01-204-6/+23
| | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:18:07 +0000