aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove tests for not swallowing exceptions.Doug Barth2013-11-152-42/+0
| | | | From PR, @tenderlove would prefer to not maintain these tests.
* Don't swallow exceptions in transctional statementsDoug Barth2013-11-054-10/+52
| | | | | | | | | | | | | | | | | | | | The MySQL connection adapater swallows all StandardError exceptions, which includes Mysql::Error and Mysql2::Error. The comment in the exception clause claims errors thrown here indicate that transactions aren't supported by the server but that isn't necessarily true. It's possible the MySQL server has gone away and swallowing a failed commit may let the application return a successful response when the data has not been saved. Also, replication libraries like Galera require that the application handle exceptions thrown at BEGIN/COMMIT. I'm unable to determine what version of MySQL threw an exception for transactional statements. I tried as far back as 3.23.49 with InnoDB disabled but BEGIN & COMMIT statements do not throw an error. If there's a real case for this logic to continue, we could instead push this behavior into a configuration setting. The exception swallowing has been there since the beginning: db045dbbf60b53dbe013ef25554fd013baf88134
* store enum mapping using `Strings` instead of `Symbols`.Yves Senn2013-11-052-3/+9
| | | | | This allows to assign both `String` and `Symbol` values to the enum without having to call `to_sym`, which is a security problem.
* direct enum assignment rasies ArgumentError for unknown values.Yves Senn2013-11-052-1/+18
|
* Merge pull request #12776 from derekprior/dp-i18n-doc-fixRafael Mendonça França2013-11-051-1/+1
|\ | | | | Clarify HTML Safe Translations
| * Clarify HTML Safe Translations [ci-skip]Derek Prior2013-11-051-1/+1
| | | | | | | | | | | | I think it's confusing to say "Use them in views without escaping." We use all keys in views without escaping - the escaping is done for us automatically _unless_ we call html_safe or the key ends in _html.
* | define enum methods inside a `Module` to make them overwritable.Yves Senn2013-11-053-13/+34
| |
* | Merge pull request #12390 from kennyj/rename_to_association_methodsRafael Mendonça França2013-11-054-7/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Renamed generated_feature_methods to generated_association_methods. Conflicts: activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/singular_association.rb activerecord/test/cases/base_test.rb
| * | Renamed generated_feature_methods to generated_association_methods.kennyj2013-09-285-12/+12
| | |
* | | Remove private API testRafael Mendonça França2013-11-051-10/+0
| |/ |/|
* | Merge pull request #12773 from ptn/use_19_syntax_in_schema_testGuillermo Iguaran2013-11-051-1/+1
|\ \ | | | | | | Use 1.9 Hash syntax consistently
| * | Use 1.9 Hash syntax consistentlyPablo Torres2013-11-051-1/+1
|/ /
* | Merge pull request #12752 from notalex/expand_path_refactoringYves Senn2013-11-053-3/+3
|\ \ | | | | | | Refactor File.expand_path usage to remove additional File.join
| * | Refactor File.expand_path usage to remove additional File.joinAlex Johnson2013-11-053-3/+3
| | |
* | | ask the fixture set for the sql statementsAaron Patterson2013-11-042-11/+17
| | |
* | | The enum value constant isn't used, so rm it for now.Aaron Patterson2013-11-042-27/+7
| | |
* | | stop doing the same calculation over and overAaron Patterson2013-11-041-4/+5
| | |
* | | oops, template replay needs to happen after bundle. :orz:Aaron Patterson2013-11-041-1/+1
| | |
* | | application template respects Gemfile entriesAaron Patterson2013-11-042-0/+25
| | |
* | | gems can be added or skipped from the templateAaron Patterson2013-11-044-2/+92
| | |
* | | fix copy & paste test-case naming. [ci skip]Yves Senn2013-11-041-1/+1
| | |
* | | document `BACKTRACE` env var usage in testing guide. [ci skip]Yves Senn2013-11-041-0/+11
| | |
* | | Fix failures related to enum changesCarlos Antonio da Silva2013-11-041-6/+4
| | | | | | | | | | | | | | | | | | Commit 6e4a810f51b9ed2468b92247ef5568cc9d6dbcc0 changed the implementation from class_eval to define_method, but missed the access to the constant versus the access to the constant name.
* | | Convert schema file to ruby 1.9 style hashCarlos Antonio da Silva2013-11-041-214/+214
| | |
* | | Style fixes on test schema fileCarlos Antonio da Silva2013-11-041-6/+6
| | |
* | | Merge pull request #12755 from cbartlett/masterCarlos Antonio da Silva2013-11-041-1/+1
|\ \ \ | | | | | | | | Remove extra whitespace
| * | | Remove extra whitespaceColin Bartlett2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | When generating an app with --skip_active_record, an extra line of whitespace was included unnecessarily.
* | | | Refactor logic to grab the max time of the list of timestamp names in #cache_keyCarlos Antonio da Silva2013-11-042-4/+4
| | | | | | | | | | | | | | | | | | | | Reuse the already existing logic used for grabbing this information from the updated columns.
* | | | Respect cache timestamp format when giving timestamps to #cache_keyCarlos Antonio da Silva2013-11-042-3/+4
|/ / /
* | | :scissors: [ci skip]Carlos Antonio da Silva2013-11-042-5/+2
| | |
* | | Merge pull request #12754 from ↵David Heinemeier Hansson2013-11-041-4/+12
|\ \ \ | | | | | | | | | | | | | | | | ck3g/replace-class-evals-with-define-method-for-enum Replace `class_eval` with `define_method` for enum
| * | | Replace `class_eval` with `define_method` for enumVitaly Tatarintsev2013-11-041-4/+12
| |/ / | | | | | | | | | https://github.com/rails/rails/commit/db41eb8a6ea88b854bf5cd11070ea4245e1639c5#commitcomment-4502683
* | | Fix typo in railties changelogCarlos Antonio da Silva2013-11-041-2/+2
| | | | | | | | | | | | Also improve the example to show as shell command [ci skip]
* | | Fix changelog indent [ci skip]Carlos Antonio da Silva2013-11-041-6/+6
|/ /
* | BACKTRACE environment variable to show unfiltered backtraces.Yves Senn2013-11-043-6/+48
| | | | | | | | | | | | | | | | | | | | | | We used to support the `BACKTRACE` environment variable but when we switched to MiniTest it got removed: f9382cd7948 This commit adds back the functionality to show the unfiltered backtrace when needed. This also works when you run your tests with `rake`: * `BACKTRACE=1 bin/rake test` * `BACKTRACE=1 ruby -Itest ...`
* | Merge pull request #12750 from arunagw/webconsole-invite-onlyGuillermo Iguaran2013-11-033-15/+0
|\ \ | | | | | | Not adding webconsole by default in new apps
| * | No web-console for nowArun Agrawal2013-11-033-15/+0
|/ /
* | Line up the comments for aestheticsDavid Heinemeier Hansson2013-11-031-5/+5
| |
* | AestheticsDavid Heinemeier Hansson2013-11-031-22/+30
| |
* | Code style for privacy indentionDavid Heinemeier Hansson2013-11-031-8/+8
| |
* | Ensure backwards compability after the #deep_munge extractionDavid Heinemeier Hansson2013-11-031-0/+10
| |
* | Add test verifying that you can only sort ARs of the same typeDavid Heinemeier Hansson2013-11-021-1/+7
| |
* | Revert "ActiveRecord::Base#<=> has been removed. Primary keys may not be in ↵David Heinemeier Hansson2013-11-023-12/+16
| | | | | | | | | | | | | | | | | | order," -- will be replaced with a check to ensure that the keys used for comparison are integers, and only fail if they are not. This reverts commit 6256734e2d0bdd89f4b5d11da259d40afa0c95c7. Conflicts: activerecord/CHANGELOG.md
* | Delegate #rewhere to all on the class like all other relation methodsDavid Heinemeier Hansson2013-11-022-1/+5
| |
* | Move documentation around a bitDavid Heinemeier Hansson2013-11-021-4/+7
| |
* | Merge pull request #12747 from yury/explicit-enum-valuesDavid Heinemeier Hansson2013-11-024-1/+15
|\ \ | | | | | | Explicit mapping for enum
| * | Explicit mapping for enumYury Korolev2013-11-024-1/+15
| | |
* | | Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, ↵David Heinemeier Hansson2013-11-023-0/+52
| | | | | | | | | | | | named where condition.
* | | unscope now works on default_scope after ↵Rafael Mendonça França2013-11-023-9/+9
|/ / | | | | | | 94924dc32baf78f13e289172534c2e71c9c8cade
* | Add a test case for the scope enum addsDavid Heinemeier Hansson2013-11-021-0/+4
| |