aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #15358 from arthurnn/redefine_habtm_fixRafael Mendonça França2014-05-273-25/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix redefine a has_and_belongs_to_many inside inherited class
| * | | | | | | Fix redefine a has_and_belongs_to_many inside inherited classArthur Neves2014-05-273-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how has_an_belongs_to_many used to work, we start raising an error when redefining the same has_an_belongs_to_many association. This commits fix that regression. [Fixes #14983]
* | | | | | | | Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_symYves Senn2014-05-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | remove unwanted `to_sym` call.
| * | | | | | | remove unwanted `to_sym` call.Kuldeep Aggarwal2014-05-261-1/+1
| | | | | | | |
* | | | | | | | Fix syntax error from 5eae77cZachary Scott2014-05-261-1/+1
| | | | | | | |
* | | | | | | | Move test to the proper fileRafael Mendonça França2014-05-262-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All preload tests are in the eager_test file
* | | | | | | | Add test case for b13d260Rafael Mendonça França2014-05-261-0/+9
| | | | | | | |
* | | | | | | | Merge pull request #15301 from zzak/issue_15212Rafael Mendonça França2014-05-261-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip if the association was already loaded.
| * | | | | | | | Skip if the association was already loaded.Zachary Scott2014-05-241-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #15353 from sgrif/sg-mysql-conditionRafael Mendonça França2014-05-261-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unnecessary branch from quoting in Mysql
| * | | | | | | | | Remove unnecessary branch from quoting in MysqlSean Griffin2014-05-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already the behavior for `BigDecimal` in the abstract adapter.
* | | | | | | | | | Typo in AR CHANGELOG [ci skip]Zachary Scott2014-05-261-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Add a public API to allow users to specify column typesSean Griffin2014-05-2617-22/+194
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result of all of the refactoring that's been done, it's now possible for us to define a public API to allow users to specify behavior. This is an initial implementation so that I can work off of it in smaller pieces for additional features/refactorings. The current behavior will continue to stay the same, though I'd like to refactor towards the automatic schema detection being built off of this API, and add the ability to opt out of automatic schema detection. Use cases: - We can deprecate a lot of the edge cases around types, now that there is an alternate path for users who wish to maintain the same behavior. - I intend to refactor serialized columns to be built on top of this API. - Gem and library maintainers are able to interact with `ActiveRecord` at a slightly lower level in a more stable way. - Interesting ability to reverse the work flow of adding to the schema. Model can become the single source of truth for the structure. We can compare that to what the database says the schema is, diff them, and generate a migration.
* | | | | | | | Allow empty arrays in where predicatesSean Griffin2014-05-261-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #15351 from sgrif/sg-allowed-typesRafael Mendonça França2014-05-261-4/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Extract types which don't require additional typecasting to a method
| * | | | | | | | Extract types which don't require additional typecasting to a methodSean Griffin2014-05-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database specific adapters shouldn't need to override `type_cast` to define types which are already in an acceptable state.
* | | | | | | | | Merge pull request #15300 from arthurnn/refactor_reflectionsRafael Mendonça França2014-05-2616-34/+85
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor reflections
| * | | | | | | | | Refactoring .reflections public method.Arthur Neves2014-05-264-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the internal reflections will hold a reference to its public representation, so when the outside world calls `Account.reflection` we can build a list of public reflections.
| * | | | | | | | | Use .to_s on _reflections lookupArthur Neves2014-05-242-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge pull request #15210 from arthurnn/fix_hbtm_reflectionArthur Neves2014-05-2416-30/+62
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix habtm reflection Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/reflection_test.rb
* | | | | | | | | Refactor the handling of arrays in where predicatesSean Griffin2014-05-261-11/+14
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies the code slightly, isolates non-nil non-range values into a single array, which will make it easier to do things like apply type casting to them in the future.
* | | | | | | | Refactor the type casting of booleans in MySQLSean Griffin2014-05-262-13/+18
| | | | | | | |
* | | | | | | | Merge pull request #15336 from sgrif/sg-quotingMatthew Draper2014-05-275-54/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove checks against `column.type` in abstract adapter quoting
| * | | | | | | | Remove checks against `column.type` in abstract adapter quotingSean Griffin2014-05-265-54/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention is to eventually remove `column` from the arguments list both for `quote` and for `type_cast` entirely. This is the first step to that end.
* | | | | | | | | Add missing test case for quoting behaviorSean Griffin2014-05-262-0/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that the only time that `quote` is called with a column, but without first calling `type_cast` is when where is called with an array. My previous pull request broke this behavior, without failing tests. This adds a test for the only case I can think of that exercises the `if column.type == :integer` branch of `quote` effectively.
* | | | | | | | Merge pull request #15307 from sgrif/sg-type-cast-for-writeYves Senn2014-05-266-10/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add an interface for type objects to control Ruby => SQL
| * | | | | | | | Add an interface for type objects to control Ruby => SQLSean Griffin2014-05-266-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to save custom types, which type cast to non-primitive ruby objects.
* | | | | | | | | pg, add missing `:nodoc:` to adapter.Yves Senn2014-05-261-8/+8
| | | | | | | | |
* | | | | | | | | pg, remove unused code. Use `extract_schema_and_table` instead.Yves Senn2014-05-261-10/+0
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | remove unused variable warningKuldeep Aggarwal2014-05-261-1/+1
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | `warning: assigned but unused variable - album`
* | | | | | | pg, remove duplicated code.Yves Senn2014-05-241-4/+0
| | | | | | |
* | | | | | | pg, extract schema definitions into separate file.Yves Senn2014-05-242-135/+141
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mirrors the layout of abstract adapter and puts the definitions inside the `PostgreSQL` namespace (no longer under the adapter namespace). /cc @kares
* | | | | | Merge pull request #15290 from sgrif/sg-consolidate-zero-scale-decimalRafael Mendonça França2014-05-236-41/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove special case in schema dumper for decimal without scale
| * | | | | | Remove special case in schema dumper for decimal without scaleSean Griffin2014-05-236-41/+42
| | | | | | |
* | | | | | | Merge pull request #15289 from zzak/future_port_c8ddb61Godfrey Chan2014-05-231-9/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Future port c8ddb61 [ci skip]
| * | | | | | | Future port c8ddb61Zachary Scott2014-05-231-9/+10
| |/ / / / / /
* | | | | | | Merge pull request #15285 from ↵Rafael Mendonça França2014-05-232-9/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | sergey-alekseev/remove-active-record-where-duplicated-condition Remove duplicated parameter check on #where!
| * | | | | | Remove duplicated parameter check on #where!Sergey Alekseev2014-05-232-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that #where! is not designed to be used as a chained where. See initial implementation at 8c2c60511beaad05a218e73c4918ab89fb1804f0. So, no need to check twice. We should not test #where! https://github.com/rails/rails/pull/15285#discussion_r13018316
* | | | | | | Merge pull request #15277 from sgrif/sg-schema-cache-refactorRafael Mendonça França2014-05-231-31/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Simplify the code in schema cache
| * | | | | | Simplify the code in schema cacheSean Griffin2014-05-231-31/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of default procs was unnessecary, made the code confusing to follow, and made marshalling needlessly complex.
* | | | | | | Merge pull request #15261 from hbin/missing_parametersRafael Mendonça França2014-05-231-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bring the missing parameters back.
| * | | | | | | Bring the missing parameters back.Bin Huang2014-05-231-1/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #15282 from sgrif/sg-remove-column-primaryRafael Mendonça França2014-05-237-52/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove `Column#primary`
| * | | | | | | Remove `Column#primary`Sean Griffin2014-05-237-52/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears to have been used at some point in the past, but is no longer used in any meaningful way. Whether a column is considered primary is a property of the model, not the schema/column. This also removes the need for yet another layer of caching of the model's schema, and we can leave that to the schema cache.
* | | | | | | Merge pull request #15265 from danielmbarlow/masterRafael Mendonça França2014-05-231-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added force_reload to Auto-generated methods doc
| * | | | | | | Added force_reload to Auto-generated methods docdanielmbarlow2014-05-231-2/+3
| | |/ / / / / | |/| | | | | | | | | | | | Should make it a little easier to find the information. Also added note to look below for the definition of the generated methods.
* | | | | | | Merge pull request #15280 from sgrif/sg-postgres-defaultsRafael Mendonça França2014-05-233-76/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move parsing of PG sql strings for defaults out of column
| * | | | | | | Move parsing of PG sql strings for defaults out of columnSean Griffin2014-05-233-76/+78
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #15271 from sgrif/sg-remove-duplicated-setupRafael Mendonça França2014-05-231-4/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove duplicated setup in test
| * | | | | | | Remove duplicated setup in testSean Griffin2014-05-231-4/+3
| |/ / / / / /