aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| | | | | | | |
* | | | | | | | Merge pull request #16318 from zuhao/refactor_activerecord_adapter_testYves Senn2014-07-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make `adapter_test` run order independently.
| * | | | | | | | Add where condition so select_one returns the correct record.Zuhao Wan2014-07-281-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #16319 from Domon/fix-each-validator-exampleYves Senn2014-07-281-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix example code of EachValidator [ci skip]
| * | | | | | | | Fix example code of `EachValidator` [ci skip]Chun-wei Kuo2014-07-281-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to specify the `:title` option to really use the `TitleValidator` defined above.
* | | | | | | | Merge pull request #16315 from ↵Jeremy Kemper2014-07-272-7/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eileencodes/fix-documentation-that-mentions-macro-instance-var Fix documentation for `@macro` and reflection types
| * | | | | | | | [ci skip] Fix documentation for @macro and reflection typeseileencodes2014-07-272-7/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `@macro` doesn't exist anymore and these reflections are no longer AssociationReflections but their own types of reflections based on macro I updated the documentation to match the changes I made in #16089 and #16198. An `AssociationReflection` that had a `@macro` of `:has_many` now is a `HasManyReflection`
* | | | | | / / Merge pull request #16282 from davidbalbert/patch-1Guillermo Iguaran2014-07-271-1/+1
|\| | | | | | | | |_|_|_|_|/ / |/| | | | | | Fix protect_from_forgery docs [ci-skip]
| * | | | | | Fix protect_from_forgery docsDavid Albert2014-07-271-1/+1
|/ / / / / /
* | | | | | Fix that render layout should also be picked up by the template dependency ↵David Heinemeier Hansson2014-07-253-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | tracker, but only half-ways. You can add that layout option on the same render call, and both templates should be added to the dependency tree. But thats going to require a more serious rework of the tracker. Please do help fix this part of it too. For now, render layout needs to be on its own line.
* | | | | | Merge pull request #16290 from a3gis/masterZachary Scott2014-07-252-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] Fix documentation of SQLite3Adapter.columns where SQLite3Column was removed in e781aa31fc52a7c696115302ef4d4e02bfd1533b
| * | | | | Remove references to SQLite3Column from documentationa3gis2014-07-251-1/+1
| | | | | |
| * | | | | Fix documentation of SQlite3Adapter.columnsa3gis2014-07-251-1/+1
| | | | | | | | | | | | | | | | | | As of https://github.com/rails/rails/commit/e781aa31fc52a7c696115302ef4d4e02bfd1533b SQLite3Column has been dropped.
* | | | | | Merge pull request #16285 from noinkling/password_digest_docsRafael Mendonça França2014-07-252-2/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add password:digest information to scaffold generator help text
| * | | | | | Additional clarification on password:digest in scaffold and model generator ↵noinkling2014-07-252-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | help [ci skip]
| * | | | | | Add password:digest information to scaffold generator help text [ci skip]noinkling2014-07-251-1/+5
| | |/ / / / | |/| | | |
* | | | | | docs, add ref where to find valid `head` status symbols.Yves Senn2014-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #16258 from mattwarrenrnp/masterYves Senn2014-07-251-11/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding indexes on tables in migration scripts [ci skip]
| * | | | | | adding indexes on tables in migration scriptsMatt Warren2014-07-241-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missed one migration script in last commit remove some empty lines using the belongs_to index option to be more concise
* | | | | | | Merge pull request #16220 from pcreux/postgresql-jsonb-supportYves Senn2014-07-256-9/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for Postgresql JSONB
| * | | | | | | Add support for Postgresql JSONBPhilippe Creux2014-07-246-9/+64
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | [Philippe Creux, Chris Teague]
* | | | | | | Merge pull request #16272 from ↵Matthew Draper2014-07-252-9/+53
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | tgxworld/fix_template_assertion_when_opening_a_session Fix template assertion when opening a session.
| * | | | | | Improve description of tests.Guo Xiang Tan2014-07-251-4/+4
| | | | | | |
| * | | | | | Bug fix for assert_template when opening a new session.Guo Xiang Tan2014-07-252-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/pull/16234#commitcomment-7115670.
* | | | | | | Merge pull request #16281 from arthurnn/copy_default_proc_hwiaSantiago Pastorino2014-07-243-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make HWIA copy the default proc too.
| * | | | | | | Make HWIA copy the default proc too.Arthur Neves2014-07-243-0/+16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [fixes #16279]
* | | | | | | tests, run adapter specific rake tests only for the right adapter.Yves Senn2014-07-243-0/+6
| | | | | | |
* | | | | | | build fix, fix error introduced with 091b246bb0111357edbb9703ea342a944b04deb6Yves Senn2014-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following issue: 1) Failure: ActiveRecord::MySQLPurgeTest#test_establishes_connection_to_test_database [test/cases/tasks/mysql_rake_test.rb:200]: not all expectations were satisfied unsatisfied expectations: - expected exactly once, not yet invoked: ActiveRecord::Base.establish_connection(:test) satisfied expectations: - allowed any number of times, invoked once: #<Mock:0x2349430>.recreate_database(any_parameters) - allowed any number of times, invoked once: ActiveRecord::Base.establish_connection(any_parameters) - allowed any number of times, invoked once: ActiveRecord::Base.connection(any_parameters)
* | | | | | | fix, mysql `db:purge` respects `Rails.env`.Yves Senn2014-07-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this method always established a connection to the test database. This resulted in buggy behavior when combined with other tasks like `bin/rake db:schema:load`. This was one of the reasons why #15394 (22e9a91189af2c4e6217a888e77f22a23d3247d1) was reverted: > I’ve replicated it on a new app by the following commands: 1) rails generate model post:title, 2) rake db:migrate, 3) rake db:schema:load, 4) rails runner ‘puts Post.first’. The last command goes boom. Problem is that rake db:schema:load wipes the database, and then doesn’t actually restore it. This is all on MySQL. There’s no problem with SQLite. -- DHH https://github.com/rails/rails/commit/22e9a91189af2c4e6217a888e77f22a23d3247d1#commitcomment-6834245
* | | | | | | clenaup, unify CHANGELOG format. [ci skip]Yves Senn2014-07-241-5/+7
| | | | | | |
* | | | | | | Merge pull request #16280 from a3gis/masterMatthew Draper2014-07-241-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Fixes #16265 and correct documentation typo
| * | | | | | Fix documentation typo in ConnectionSpecification::Resolve.speca3gis2014-07-241-1/+1
| | | | | | |
| * | | | | | Fixes #16265a3gis2014-07-241-1/+1
| | | | | | |
* | | | | | | pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`.Yves Senn2014-07-242-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #16261. [Matthew Draper, Yves Senn] Using `DEFAULT NULL` results in the same behavior as `DROP DEFAULT`. However, PostgreSQL will cast the default to the columns type, which leaves us with a default like "default NULL::character varying". /cc @matthewd
* | | | | | | Merge pull request #16276 from y-yagi/bug_report_templatesMatthew Draper2014-07-242-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip]Add i18n master to the Gemfile
| * | | | | | [ci skip]Add i18n master to the Gemfileyuuji.yaginuma2014-07-242-0/+2
| |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 22:12:31 +0000