aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make ClosedTransaction a null objectArthur Neves2014-07-311-16/+6
|
* Remove parent on Transaction objectArthur Neves2014-07-311-16/+9
|
* Remove being/number methods from transaction classArthur Neves2014-07-312-29/+10
|
* Merge pull request #16335 from arthurnn/rm_parent_state_trasactionRafael Mendonça França2014-07-291-2/+1
|\ | | | | Remove @state.parent assignment on commit
| * Remove @state.parent assignment on commitArthur Neves2014-07-291-2/+1
| | | | | | | | | | | | | | | | | | This piece of code was introduced on 67d8bb963d5d51fc644d6b1ca20164efb4cee6d7 , which was calling `committed?` in the `transaction_state` before calling the `committed!` method. However on 7386ffc781fca07a0c656db49fdb54678caef809, the `committed?` check was removed and replaced by a `finalized?`, which only checks if the state is not nil. Thus we can remove that line.
* | oops! :bomb:Aaron Patterson2014-07-291-1/+1
| | | | | | | | use helpers.include? so we don't get any false positives
* | ask the named routes collection if the route is definedAaron Patterson2014-07-292-1/+5
| | | | | | | | | | we should not be accessing internals to figure out if a method is defined.
* | helpers should be a Set so it doesn't grow unboundedAaron Patterson2014-07-291-4/+12
| | | | | | | | | | since helpers is a set, we can be confident about when to remove methods from the module.
* | pass the module to define_named_route_methodsAaron Patterson2014-07-291-7/+7
| | | | | | | | after this, we can disconnect @module from the instance
* | only ask for the routes module onceAaron Patterson2014-07-291-2/+4
| | | | | | | | we can cache the module on the stack, then reuse it
* | eval_block should be privateAaron Patterson2014-07-291-0/+1
| |
* | :nail_care: from #16329 [ci skip]Zachary Scott2014-07-291-1/+1
| |
* | Merge pull request #16329 from deependersingla/masterZachary Scott2014-07-291-0/+2
|\ \ | | | | | | GET request should not write to database note added. [ci skip]
| * | Get request should not write to database note added. [skip ci]Deepender Singla2014-07-291-0/+2
| | |
* | | Merge pull request #16336 from akshay-vishnoi/fix-testsRafael Mendonça França2014-07-292-24/+16
|\ \ \ | | | | | | | | Add missing test case for Array#to_sentence, collect all test cases for Object#to_param at one place and avoid repitition
| * | | Add missing test case for Array#to_sentence, collect all test cases for ↵Akshay Vishnoi2014-07-292-24/+16
|/ / / | | | | | | | | | Object#to_param at one place and avoid repitition
* | | Merge pull request #16334 from akshay-vishnoi/array-testsRafael Mendonça França2014-07-297-482/+495
|\ \ \ | |_|/ |/| | Move array test files under array
| * | Move array test files under arrayAkshay Vishnoi2014-07-297-482/+495
| | |
* | | docs, cleanup mixed indents within `form_options_helper.rb` RDoc.Yves Senn2014-07-291-81/+81
| | | | | | | | | | | | | | | | | | | | | [ci skip] This fixes the broken code block rendering and indents the examples within the parameter list.
* | | Merge pull request #16332 from shizm/fix-docs-validates-uniqueness-ofRobin Dupret2014-07-291-1/+1
|\ \ \ | | | | | | | | [ci skip] fix doc typo for validates_uniqueness_of
| * | | [ci skip] fix doc typo for validates_uniqueness_ofSatoru Yamasaki2014-07-291-1/+1
|/ / /
* | | Merge pull request #16328 from noinkling/template_password_confirmation_fixYves Senn2014-07-292-1/+6
|\ \ \ | | | | | | | | | | | | Give password_confirmation div the "field" class in the scaffold generator "_form" partial
| * | | Give password_confirmation div the "field" class in erb form templatenoinkling2014-07-291-1/+1
| | | |
* | | | Merge pull request #16148 from rails/fix_json_autoloadGodfrey Chan2014-07-293-3/+52
|\ \ \ \ | | | | | | | | | | Fix json autoload
| * | | | Fixed a compatibility issue with the `Oj` gemGodfrey Chan2014-07-292-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Time#as_json`, `Date#as_json` and `DateTime#as_json` incorrectly depends on a delegation that is set up in `active_support/json/encoding`. We cannot simply require that file in `core_ext/object/json` because it would cause a circular dependency problem (see #12203 for background). We should instead rely on AS's autoload to load that file for us on-demand. To trigger autoload correctly, we need to reference the `AS::JSON::Encoding` constant instead of using the delegated version. Fixes #16131.
| * | | | Added failing test case for #16131Godfrey Chan2014-07-291-0/+42
| |/ / /
* / / / Raise an exception when attachments are added after `mail` was called.Yves Senn2014-07-293-1/+62
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #16163 Adding attachments after a call to `mail` will result in invalid emails. This is related to the fact, that `mail` is making the required preparations before the email is ready to be sent. These change depending on your added attachments.
* | | Merge pull request #15629 from akshay-vishnoi/test-to_paramRafael Mendonça França2014-07-284-66/+81
|\ \ \ | |/ / |/| | Define Hash#to_query and set Hash#to_param as alias to it; with test cases
| * | Move to_param to to_query, also Improve testsAkshay Vishnoi2014-06-204-66/+81
| | |
* | | Merge pull request #15658 from akshay-vishnoi/object-testsRafael Mendonça França2014-07-283-65/+65
|\ \ \ | | | | | | | | Move object test files under object
| * | | Move object test files under objectAkshay Vishnoi2014-07-293-65/+65
|/ / /
* | | Merge pull request #16326 from itsNikolay/remove_blank_linesRafael Mendonça França2014-07-288-8/+0
|\ \ \ | | | | | | | | remove blank lines at the start of the ActiveRecord files
| * | | remove blank lines in the start of the ActiveRecord filesPonomarev Nikolay2014-07-298-8/+0
|/ / /
* | | remove the mounted? methodAaron Patterson2014-07-282-6/+2
| | | | | | | | | | | | | | | we know the routes should not be "optimized" when mounting an application
* | | remove some cachingAaron Patterson2014-07-281-2/+1
| | | | | | | | | | | | | | | this caching doesn't increase performance, but does increase complexity. remove it for now and find better ways to speed up this code.
* | | Merge pull request #16305 from tomkadwill/documented_change_tableRafael Mendonça França2014-07-281-1/+1
|\ \ \ | | | | | | | | Added documentation for change_table
| * | | Added nodoc to change_tableTom Kadwill2014-07-281-1/+1
| | | |
* | | | Extract the transaction class to a local variableRafael Mendonça França2014-07-281-6/+2
| | | |
* | | | Merge pull request #16284 from arthurnn/transactionsRafael Mendonça França2014-07-284-62/+101
|\ \ \ \ | | | | | | | | | | | | | | | Transactions refactoring
| * | | | savepoint_name should return nil for non-savepoint transactionsArthur Neves2014-07-283-4/+27
| | | | | | | | | | | | | | | | | | | | Also add test to assets the savepoint name
| * | | | Transactions refactoringArthur Neves2014-07-283-38/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a transaction manager per connection, so it can controls the connection responsibilities. Delegate transaction methods to transaction_manager
| * | | | Remove finishing? method from transaction.Arthur Neves2014-07-242-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The finishing variable on the transaction object was a work-around for the savepoint name, so after a rollback/commit the savepoint could be released with the previous name. related: 9296e6939bcc786149a07dac334267c4035b623a 60c88e64e26682a954f7c8cd6669d409ffffcc8b
* | | | | Fix typo and remove code block since present is not a method.Rafael Mendonça França2014-07-281-1/+1
| | | | |
* | | | | docs, clarify attribute query methods on numeric columns. Closes #16246.Yves Senn2014-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #16303 from rajcybage/removing_masterYves Senn2014-07-281-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | remove empty unused method
| * | | | | add comment to the empty each method for not removing it in futureRajarshi Das2014-07-261-1/+2
| | | | | |
* | | | | | Merge pull request #16297 from calebthompson/extract-iterator-methodRafael Mendonça França2014-07-281-10/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extract iterator method in AR::SchemaDumper
| * | | | | | Extract iterator method in AR::SchemaDumperCaleb Thompson2014-07-251-10/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gems which wish to tie into ActiveRecord::SchemaDumper need to duplicate this logic currently. [Foreigner] is one such example, as is a library I'm currently working on but which hasn't been released yet: def tables_with_foreign_keys(stream) tables_without_foreign_keys(stream) @connection.tables.sort.each do |table| next if ['schema_migrations', ignore_tables].flatten.any? do |ignored| case ignored when String; table == ignored when Regexp; table =~ ignored else raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.' end end foreign_keys(table, stream) end end [Foreigner]: https://github.com/matthuhiggins/foreigner/blob/master/lib/foreigner/schema_dumper.rb#L36-L43 Extract the skip logic to a method, making it much simpler to follow this same behavior in gems that are tying into the migration flow and let them dump only tables that aren't skipped without copying this block of code. The above code could then be simplified to: def tables_with_foreign_keys(stream) tables_without_foreign_keys(stream) @connection.tables.sort.each do |table| foreign_keys(table, stream) unless ignored?(table) end end It also, in my opinion, simplifies the logic on ActiveRecord's side, and clarifies the intent of the skip logic.
* | | | | | Merge pull request #16295 from kenn/no_stacktrace_drop_taskRafael Mendonça França2014-07-282-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | No verbose backtrace by db:drop when database does not exist.
| * | | | | | No verbose backtrace by db:drop when database does not exist.Kenn Ejima2014-07-272-0/+8
| | | | | | |