Commit Graph

5358 Commits

Author SHA1 Message Date
Yves Senn
d93aae9ae7 tests, remove unused requires.
"active_support/testing/stream" is already required in `test_case.rb`.
Furthermore the test "test/cases/migration_test.rb" could no longer be executed
directly.
2015-02-12 10:31:37 +01:00
Sean Griffin
c51f9b61ce Refactor enum to be defined in terms of the attributes API
In addition to cleaning up the implementation, this allows type casting
behavior to be applied consistently everywhere. (#where for example). A
good example of this was the previous need for handling value to key
conversion in the setter, because the number had to be passed to `where`
directly. This is no longer required, since we can just pass the string
along to where. (It's left around for backwards compat)

Fixes #18387
2015-02-11 15:02:36 -07:00
Sean Griffin
5e0b555b45 current_scope shouldn't pollute sibling STI classes
It looks like the only reason `current_scope` was thread local on
`base_class` instead of `self` is to ensure that when we call a named
scope created with a proc on the parent class, it correctly uses the
default scope of the subclass. The reason this wasn't happening was
because the proc captured `self` as the parent class, and we're not
actually defining a real method. Using `instance_exec` fixes the
problem.

Fixes #18806
2015-02-11 13:46:30 -07:00
Sean Griffin
c9cc1f47ad Remove the SQLite3 Binary subclass
As far as I can tell, the original reason that this behavior was added
has been sufficiently resolved elsewhere, as we no longer remove the
encoding of strings coming out of the database.
2015-02-11 10:32:13 -07:00
Sean Griffin
9a656a7776 Merge pull request #18883 from kamipo/fix_datetime_precision_dumping_zero_for_postgresql
The datetime precision with zero should be dumped
2015-02-11 08:24:47 -07:00
Yves Senn
3ffffcc39d prefer drop_table :table, if_exists: true over explicit checks. 2015-02-11 11:21:00 +01:00
Yves Senn
174f5ed545 add test to ensure remove_reference with index and fk is invertable. 2015-02-11 11:20:59 +01:00
Yves Senn
a893718c31 fix remove_reference with foreign_key: true on MySQL. #18664.
MySQL rejects to remove an index which is used in a foreign key constraint:

```
ActiveRecord::StatementInvalid: Mysql2::Error: Cannot drop index 'index_copies_on_title_id': needed in a foreign key constraint: ALTER TABLE `copies` DROP `title_id`
```

Removing the constraint before removing the column (and the index) solves this problem.
2015-02-11 11:20:59 +01:00
Ryuta Kamizono
18e0ffe90f The datetime precision with zero should be dumped
`precision: 0` was not dumped by f1a0fa9e19b7e4ccaea191fc6cf0613880222ee7.
However, `precision: 0` is valid value for PostgreSQL timestamps.
2015-02-11 09:53:34 +09:00
Rafael Mendonça França
5d180fdf06 Merge pull request #12257 from vipulnsward/end_on_find_in_batches
Add an option `end` to `find_in_batches`
2015-02-10 17:16:48 -02:00
Sean Griffin
f1a0fa9e19 Refactor microsecond precision to be database agnostic
The various databases don't actually need significantly different
handling for this behavior, and they can achieve it without knowing
about the type of the object.

The old implementation was returning a string, which will cause problems
such as breaking TZ aware attributes, and making it impossible for the
adapters to supply their logic for time objects.
2015-02-10 11:55:59 -07:00
Sean Griffin
2f8c596d1b Maintain a consistent order in ActiveRecord::Base#attributes
Fixes #18871
2015-02-10 08:21:46 -07:00
Vipul A M
3dc432068b Add an option end_at to find_in_batches
that complements the `start`parameter to specify where to stop batch processing
2015-02-09 01:33:57 +05:30
Carlos Antonio da Silva
f636ab75f1 Remove debug code
Added by 101c19f55f5f1d86d35574b805278f11e9a1a48e.
2015-02-08 11:51:22 -02:00
Ryuta Kamizono
f983912037 Fix rounding problem for PostgreSQL timestamp column
If timestamp column have the precision, it need to format according to
the precision of timestamp column.
2015-02-08 22:22:55 +09:00
Andrew White
31fafe0a32 Merge pull request #18602 from kamipo/respect_database_charset_and_collation
Respect the database default charset for `schema_migrations` table.
2015-02-08 13:12:01 +00:00
Andrew White
b1e6794238 Merge pull request #18848 from kamipo/add_auto_increment_method
Add `auto_increment?` instead of `extra == 'auto_increment'`
2015-02-08 13:07:53 +00:00
Ryuta Kamizono
1f39b731c1 Remove unused line 2015-02-08 20:14:07 +09:00
Ryuta Kamizono
3bd83f016c Add auto_increment? instead of extra == 'auto_increment' 2015-02-08 18:27:35 +09:00
Ryuta Kamizono
0bbff5ee16 Respect the database default charset for schema_migrations table.
The charset of `version` column in `schema_migrations` table is depend
on the database default charset and collation rather than the encoding
of the connection.
2015-02-08 11:19:33 +09:00
Sean Griffin
1492e83e49 rm Type#number?
This predicate is only used in `query_attribute`, and is relatively easy
to remove without adding a bunch of is a checks.
2015-02-07 17:36:22 -07:00
Sean Griffin
631707a572 Push multi-parameter assignement into the types
This allows us to remove `Type::Value#klass`, as it was only used for
multi-parameter assignment to reach into the types internals. The
relevant type objects now accept a hash in addition to their previous
accepted arguments to `type_cast_from_user`. This required minor
modifications to the tests, since previously they were relying on the
fact that mulit-parameter assignement was reaching into the internals of
time zone aware attributes. In reaility, changing those properties at
runtime wouldn't change the accessor methods for all other forms of
assignment.
2015-02-07 13:52:23 -07:00
Rafael Mendonça França
b71e08f8ba Raise ArgumentError when passing nil to Relation#merge
nil or false should not be valid argument to the merge method.

Closes #12264
2015-02-06 17:53:06 -02:00
Sean Griffin
101c19f55f Allow a symbol to be passed to attribute, in place of a type object
The same is not true of `define_attribute`, which is meant to be the low
level no-magic API that sits underneath. The differences between the two
APIs are:

- `attribute`
  - Lazy (the attribute will be defined after the schema has loaded)
  - Allows either a type object or a symbol
- `define_attribute`
  - Runs immediately (might get trampled by schema loading)
  - Requires a type object

This was the last blocker in terms of public interface requirements
originally discussed for this feature back in May. All the
implementation blockers have been cleared, so this feature is probably
ready for release (pending one more look-over by me).
2015-02-06 11:51:13 -07:00
Rafael Mendonça França
726b95e5ce Merge pull request #18589 from kamipo/fix_test_types_line_up
Fix `test_types_line_up` when column type missing
2015-02-05 18:30:03 -02:00
Rafael Mendonça França
6953f16efa Merge pull request #18526 from vipulnsward/add-silence-stream
Extracted silence_stream method to new module in activesupport/testing
2015-02-05 18:28:51 -02:00
Rafael Mendonça França
9ec973f0ac Do not run remove_connection in memory db test
This will make rake test_sqlite3_mem work again
2015-02-05 17:31:00 -02:00
Sean Griffin
e440e8daba Merge pull request #18809 from meltheadorable/bugfix/postgres_money
Fix bug causing table creation to fail for models with postgresql 'money' field
2015-02-04 09:13:55 -07:00
Melody
2eeb29a925 Fix test cases for money, bit and bit_varying 2015-02-04 11:07:08 -05:00
Sean Griffin
cd0ed12d1a Respect custom primary keys for associations in Relation#where
While we query the proper columns, we go through normal handling for
converting the value to a primitive which assumes it should use the
table's primary key. If the association specifies a different value (and
we know that we're working with an association), we should use the
custom primary key instead.

Fixes #18813.
2015-02-04 08:56:46 -07:00
Sean Griffin
158c7eb1d6 rm Column#cast_type
The type from the column is never used, except when being passed to the
attributes API. While leaving the type on the column wasn't necessarily
a bad thing, I worry that it's existence there implies that it is
something which should be used.

During the design and implementation process of the attributes API,
there have been plenty of cases where getting the "right" type object
was hard, but I had easy access to the column objects. For any
contributor who isn't intimately familiar with the intents behind the
type casting system, grabbing the type from the column might easily seem
like the "correct" thing to do.

As such, the goal of this change is to express that the column is not
something that should be used for type casting. The only places that are
"valid" (at the time of this commit) uses of acquiring a type object
from the column are fixtures (as the YAML file is going to mirror the
database more closely than the AR object), and looking up the type
during schema detection to pass to the attributes API

Many of the failing tests were removed, as they've been made obsolete
over the last year. All of the PG column tests were testing nothing
beyond polymorphism. The Mysql2 tests were duplicating the mysql tests,
since they now share a column class.

The implementation is a little hairy, and slightly verbose, but it felt
preferable to going back to 20 constructor options for the columns. If
you are git blaming to figure out wtf I was thinking with them, and have
a better idea, go for it. Just don't use a type object for this.
2015-02-03 15:02:18 -07:00
Vipul A M
6eced6a1fe Removed magic comments # encoding: utf-8 , since its default from ruby 2.0 onwards. 2015-02-03 20:51:40 +05:30
Sean Griffin
186418724c Merge pull request #18791 from Sinjo/consistent-foreign-key-name-generation
Consistent foreign key name generation
2015-02-02 18:43:05 -07:00
Chris Sinjakli
b8e1f20267 Generate consistent names for foreign keys 2015-02-03 01:37:29 +00:00
Sean Griffin
4ec5b0d6b4 Properly lookup the limit for bigint
Fixes #18787.
2015-02-02 15:20:11 -07:00
eileencodes
27aa4dda7d Fix validations on child record when record parent has validate: false
Fixes #17621. This 5 year old (or older) issue causes validations to fire
when a parent record has `validate: false` option and a child record is
saved. It's not the responsibility of the model to validate an
associated object unless the object was created or modified by the
parent.

Clean up tests related to validations

`assert_nothing_raised` is not benefiting us in these tests
Corrected spelling of "respects"
It's better to use `assert_not_operator` over `assert !r.valid`
2015-02-01 16:03:49 -08:00
Mingdong Luo
549d171a90 Merge branch 'master' into pr/18316
Conflicts:
	activerecord/CHANGELOG.md
2015-01-31 19:23:48 -08:00
Sean Griffin
70ac072976 Attribute assignment and type casting has nothing to do with columns
It's finally finished!!!!!!! The reason the Attributes API was kept
private in 4.2 was due to some publicly visible implementation details.
It was previously implemented by overloading `columns` and
`columns_hash`, to make them return column objects which were modified
with the attribute information.

This meant that those methods LIED! We didn't change the database
schema. We changed the attribute information on the class. That is
wrong! It should be the other way around, where schema loading just
calls the attributes API for you. And now it does!

Yes, this means that there is nothing that happens in automatic schema
loading that you couldn't manually do yourself. (There's still some
funky cases where we hit the connection adapter that I need to handle,
before we can turn off automatic schema detection entirely.)

There were a few weird test failures caused by this that had to be
fixed. The main source came from the fact that the attribute methods are
now defined in terms of `attribute_names`, which has a clause like
`return [] unless table_exists?`. I don't *think* this is an issue,
since the only place this caused failures were in a fake adapter which
didn't override `table_exists?`.

Additionally, there were a few cases where tests were failing because a
migration was run, but the model was not reloaded. I'm not sure why
these started failing from this change, I might need to clear an
additional cache in `reload_schema_from_cache`. Again, since this is not
normal usage, and it's expected that `reset_column_information` will be
called after the table is modified, I don't think it's a problem.

Still, test failures that were unrelated to the change are worrying, and
I need to dig into them further.

Finally, I spent a lot of time debugging issues with the mutex used in
`define_attribute_methods`. I think we can just remove that method
entirely, and define the attribute methods *manually* in the call to
`define_attribute`, which would simplify the code *tremendously*.

Ok. now to make this damn thing public, and work on moving it up to
Active Model.
2015-01-31 19:42:38 -07:00
Aaron Patterson
c79220368e Merge pull request #18512 from vipulnsward/18492-fixtures-with-sti
Fix STI for fixtures from multi-files
2015-01-31 18:03:45 -08:00
Aaron Patterson
6b4a5952d3 Merge pull request #18700 from nygrenh/better-required-message
Provide a better error message on :required association
2015-01-31 14:10:23 -08:00
Sean Griffin
b93b39eff6 Remove most type related predicates from Column
Remaining are `limit`, `precision`, `scale`, and `type` (the symbol
version). These will remain on the column, since they mirror the options
to the `column` method in the schema definition DSL
2015-01-30 11:42:54 -07:00
Sean Griffin
dedb946bfb Fix a state leak in autosave_association_test
The test added in 85465ed3e6c582d25f0c8fafe21f7a2c182c2f67 was passing
when the file was run on its own, but failing when the entire suite was
run since this test modifies the class and doesn't clean up.
2015-01-30 09:34:40 -07:00
Sean Griffin
85465ed3e6 Always perform validations on nested attribute associations
Collection associations would have already been validated, but singular
associations were not.

Fixes #18735.
2015-01-30 07:27:20 -07:00
Ryuta Kamizono
add37bd645 Fix test_types_line_up when column type missing
a column type `xml` is missing in regexp pattarn. However,
`assert_equal 1, lengths.uniq.length` is success when `lengths` are all
`nil` because a column type is missing. a test will be failed by using
`compact` when a column type is missing.
2015-01-30 13:40:29 +09:00
Sean Griffin
38dd7939e6 Post.all.or(anything) == Post.all 2015-01-29 13:57:47 -07:00
Bogdan Gusiev
e94330fe40 Fixed AR::Relation#group method when argument is a SQL reserved keyword 2015-01-29 17:27:02 +02:00
Sean Griffin
74c2961bd8 Don't error when grouped calculations return 0 records
Fixes #18717
2015-01-28 16:01:12 -07:00
Sean Griffin
9e42cf019f Merge Pull Request #16052 Added #or to ActiveRecord::Relation 2015-01-28 15:21:23 -07:00
Sean Griffin
96ac14a385 Always convert strings to UTF-8, regardless of column type in SQLite
All columns which would map to a string primitive need this behavior.
Binary has it's own marker type, so it won't go through this conversion.
String and text, which need this, will.

Fixes #18585.
2015-01-28 15:19:13 -07:00
Sean Griffin
ff45b9e9f7 Bring the implementation of Relation#or up to speed 2015-01-28 14:35:03 -07:00