aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21614 from kamipo/correctly_dump_composite_primary_keyJeremy Daer (Kemper)2015-09-197-36/+75
|\ | | | | Correctly dump composite primary key
| * Correctly dump composite primary keyRyuta Kamizono2015-09-207-36/+75
| | | | | | | | | | | | | | | | | | Example: create_table :barcodes, primary_key: ["region", "code"] do |t| t.string :region t.integer :code end
* | Remove `@connection` in `StatementPool`Ryuta Kamizono2015-09-204-8/+6
| | | | | | | | | | `@connection` in `StatementPool` is only used for PG adapter. No need for abstract `StatementPool` class.
* | Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.Jerry D'Antonio2015-09-193-11/+11
|/ | | | | | | The thread_safe gem is being deprecated and all its code has been merged into the concurrent-ruby gem. The new class, Concurrent::Map, is exactly the same as its predecessor except for fixes to two bugs discovered during the merge.
* Merge pull request #21650 from mcfiredrill/nodoc-raw-write-attributeArthur Nogueira Neves2015-09-191-1/+1
|\ | | | | nodoc raw_write_attribute
| * nodoc raw_write_attributeTony Miller2015-09-191-1/+1
| | | | | | | | | | Is this supposed to be public API? If so, I can document it instead. :memo:
* | Merge pull request #21666 from ronakjangir47/enum_refactoringGodfrey Chan2015-09-181-21/+13
|\ \ | | | | | | DRY enum conflict detection
| * | DRY enum conflict detectionRonak Jangir2015-09-181-21/+13
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-09-182-2/+2
|\| |
| * | [ci skip] Fix module name of documentyui-knk2015-09-171-1/+1
| | |
| * | [ci skip] Replace double spaces with single spaceyui-knk2015-09-171-1/+1
| | |
* | | File encoding is defaulted to utf-8 in Ruby >= 2.1Akira Matsuda2015-09-182-3/+0
| | |
* | | D HH => D H HAkira Matsuda2015-09-181-1/+1
| | |
* | | Merge pull request #21654 from yui-knk/fix/doc_apiArthur Nogueira Neves2015-09-171-7/+1
|\ \ \ | | | | | | | | [ci skip] Remove useless "@api public/private"
| * | | [ci skip] Remove useless "@api public/private"yui-knk2015-09-171-7/+1
| | | | | | | | | | | | | | | | Other public APIs do not have these annotations.
* | | | Merge pull request #21581 from ronakjangir47/restrict_with_errorYves Senn2015-09-172-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | `restrict_with_error` message will now respect owner’s human name
| * | | `restrict_with_error` message will now respect owner’s human name in any ↵Ronak Jangir2015-09-122-2/+2
| | | | | | | | | | | | | | | | locale [kuboon & Ronak Jangir]
* | | | Merge pull request #21637 from amitsuroliya/doc_fixesKasper Timm Hansen2015-09-171-2/+2
|\ \ \ \ | | | | | | | | | | Improved ActiveRecord Connection Pool docs [ci skip]
| * | | | Improved ActiveRecord Connection Pool docs [ci skip]amitkumarsuroliya2015-09-171-2/+2
| | | | |
* | | | | s/Github/GitHub/Akira Matsuda2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #21646 from ↵Richard Schneeman2015-09-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | schneems/schneems/no-hardcoded-ignored-lines-in-schema-dumper Don't hardcode table name
| * | | | Don't hardcode table nameschneems2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The schema_migrations table name is configurable. We should use this value when checking for ignored table names when dumping schema instead of a hardcoded value.
* | | | | [ci skip] Remove `DEFAULT NULL` from examplesYasuo Honda2015-09-161-2/+2
| | | | |
* | | | | Merge pull request #21623 from schneems/schneems/schema-migration-docsRichard Schneeman2015-09-151-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Doc SchemaMigration class.
| * | | | | Doc SchemaMigration class.schneems2015-09-141-1/+5
| | | | | |
* | | | | | Merge pull request #20848 from ↵Arthur Nogueira Neves2015-09-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | deivid-rodriguez/fix_undefined_method_error_on_exception Fix undefined method error on exception
| * | | | | Fix undefined method error on exceptionDavid Rodríguez2015-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `error` method is not defined, in general, for exceptions. Instead, print the exception message. This error was hiding actual meaningful DB configuration errors. See http://stackoverflow.com/questions/18774463.
* | | | | | Fix doc of limit option for a text column [ci skip]Ryuta Kamizono2015-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up #21591. The document of limit option for a text column is incorrect. MySQL: the limit is byte length, not character length Pg, Sqlite3: variable unlimited length
* | | | | | Merge pull request #21591 from kamipo/text_and_blob_limit_is_byte_lengthRafael Mendonça França2015-09-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | TEXT and BLOB limit is byte length, not character length.
| * | | | | | TEXT and BLOB limit is byte length, not character length.Ryuta Kamizono2015-09-111-2/+2
| | | | | | |
* | | | | | | Merge pull request #21568 from amitsuroliya/mysql_version_updateRafael Mendonça França2015-09-135-9/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Updated MySQL documentation link to MySQL latest version 5.7 everywhe…
| * | | | | | Updated MySQL documentation link to MySQL latest version 5.7 everywhere [ci ↵amitkumarsuroliya2015-09-105-9/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | skip] Bumps from `5.6` to `5.7`
* / | | | | Explicitly require AR/attribute where using itAkira Matsuda2015-09-101-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | autoloading this could possibly cause some weird race condition when calling an AR::Attribute's singleton method on a threaded server.
* | | | | remove dead code.Yves Senn2015-09-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last call site of `last_version` was removed with: 838e18321118ee3ec6669217e5ea0216f79c969a
* | | | | Merge pull request #21486 from bogdan/refactor-has-many-counter-cacheEileen M. Uchitelle2015-09-093-70/+60
|\ \ \ \ \ | | | | | | | | | | | | HasManyAssociation: moved half of counter cache code to reflection
| * | | | | HasManyAssociation: moved half of counter cache code to reflectionBogdan Gusiev2015-09-033-70/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation has a lot of utility methods that accept reflection call a lot of methods on it and exit. E.g. has_counter_cache?(reflection) It causes confusion and inability to cache result of the method even through it always returns the same result for the same reflection object. It can be done easier without access to the association context by moving code into reflection itself. e.g. reflection.has_counter_cache? Reflection is less complex object than association so moving code there automatically makes it simplier to understand.
* | | | | | Merge pull request #21529 from rngtng/move-migrations-paths-to-database-taskYves Senn2015-09-091-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use `ActiveRecord::Tasks::DatabaseTasks.migrations_paths` explicit for db tasks
| * | | | | | Use `ActiveRecord::Tasks::DatabaseTasks.migrations_paths` instead of ↵Tobias Bielohlawek2015-09-071-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `Migrator.migrations_paths`
* | | | | | | remove dead code.Yves Senn2015-09-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is private API and never used. Let's remove it.
* | | | | | | adjust method visibility according to it's usage.Yves Senn2015-09-091-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Schema#migrations_paths` is not supposed to be public API. In fact it's only used inside `Schema` itself, so let's make it private.
* | | | | | | Don't set the default argumentRafael Mendonça França2015-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is always passed in
* | | | | | | Invert the conditionalRafael Mendonça França2015-09-091-1/+1
| | | | | | |
* | | | | | | Remove dead codeRafael Mendonça França2015-09-091-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage was removed in 5c4495538b
* | | | | | | Revert "Merge pull request #20080 from ↵Rafael Mendonça França2015-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robertjlooby/fix_overwriting_by_dynamic_finders" This reverts commit d5ba9a42a6e93b163a49f99d739aa56820e044d0, reversing changes made to 30c503395bf6bf7db1ec0295bd661ce644628db5. Reason: This generate the dynalic finders more than one time
* | | | | | | Merge pull request #20080 from robertjlooby/fix_overwriting_by_dynamic_findersRafael Mendonça França2015-09-091-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | put dynamic matchers on GeneratedAssociationMethods instead of model
| * | | | | | | put dynamic matchers on the GeneratedAssociationMethods instead of modelRob Looby2015-05-081-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #21554 from ronakjangir47/added_nodocRafael Mendonça França2015-09-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added nodoc tag for the methods which returns object of private apis
| * | | | | | | | Added nodoc for `arel` method which returns object of private api. [ci skip]Ronak Jangir2015-09-091-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #20921 from pboling/fix-sql-colors-in-log-subscriberRafael Mendonça França2015-09-091-7/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and Improve sql logging coloration in `ActiveRecord::LogSubscriber`.
| * | | | | | | | | Remove extraneous `then` from case statementPeter Boling2015-07-171-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CR feedback from @egilburg Additionally - Move logic for colorizing the payload name into a separate method - Make some `ActiveRecord::LogSubscriber` instance methods private for clarity: - `colorize_payload_name` - `sql_color` - `logger` - Improve Changelog Documentation GH #20885
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 02:18:21 +0000