Commit Graph

7660 Commits

Author SHA1 Message Date
Aaron Patterson
2a67a8cc59 Merge pull request #6136 from mhfs/sqlbypass_fixes
Bring SqlByPassTest to light and fix broken tests
2012-05-16 11:27:24 -07:00
Aaron Patterson
4025efb53b Merge pull request #6349 from erichmenge/patch-raise-type-errors
Integer limit out of range should be allowed to raise. Closes #6272
2012-05-16 11:25:43 -07:00
Carlos Antonio da Silva
aa964204b8 Merge pull request #6336 from erichmenge/patch-pluck-fragment
Fixes issue where SQL fragments prevented type casting based on column
2012-05-16 11:17:04 -07:00
Erich Menge
c90f16da62 Fixes issue where SQL fragments prevented type casting based on column type. 2012-05-16 12:02:02 -05:00
Erich Menge
56cef492c6 Integer limit out of range should be allowed to raise. Closes #6272 2012-05-16 07:46:01 -05:00
Piotr Sarnacki
4edb497676 Remove unneeded tests 2012-05-16 00:40:46 -07:00
Vijay Dev
80ba7a8bac Merge pull request #6347 from avakhov/ar-changelog-misprint
Fix misprint in AR changelog
2012-05-15 23:56:23 -07:00
Piotr Sarnacki
57d534ee9e Merge pull request #6344 from erichmenge/patch_sqlite_time_type
SQLite3 doesn't actually support the 'time' type.
2012-05-15 22:14:54 -07:00
Alexey Vakhov
2baa8ba953 Fix misprint in AR changelog 2012-05-16 09:06:57 +04:00
Oscar Del Ben
e8b809070d Remove useless check of adapter 2012-05-15 20:48:51 -07:00
Marcelo Silveira
279fef1f9f Rename test file so that the test suite matches it, implement persisted? for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error). 2012-05-16 00:28:03 -03:00
Erich Menge
d9fc180fb4 SQLite3 doesn't actually support the 'time' type. 2012-05-15 22:05:00 -05:00
Carlos Galdino
6c79e82002 Remove unnecessary calls to primary_key on sqlite3_adapter 2012-05-15 19:25:15 -03:00
Carlos Antonio da Silva
6f226e0160 Merge pull request #6325 from kennyj/fix_5832-3
Remove unnecessary assertions.
2012-05-15 14:16:51 -07:00
Jeremy Kemper
ea50d53da1 Expand and improve #pluck docs 2012-05-15 10:29:09 -07:00
Jeremy Kemper
3f352d0405 Restore support for Model.pluck('sql fragment') 2012-05-15 10:29:09 -07:00
kennyj
53debf1456 Remove unnecessary assertions. We should only test the before_seq isn't same to the after_seq when using sequencer. 2012-05-16 01:33:52 +09:00
Angelo capilleri
0bbcc91b8c corrected some misspelling 2012-05-15 18:01:40 +02:00
Carlos Antonio da Silva
e3cc49cff7 Remove extra end in arel_table docs. [ci skip]
Introduced in 7ecfe3d30ccfaee8dcca4ee649cc006c090bdfb4
2012-05-15 10:00:59 -03:00
Vijay Dev
59b03d418f Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionpack/lib/action_view/helpers/asset_tag_helper.rb
2012-05-15 13:13:55 +05:30
Oscar Del Ben
7ecfe3d30c Add documentation for arel_table 2012-05-14 20:30:34 -07:00
Sean Scally
3188f81199 Set the primary key during #copy_table if necessary. Fixes [#2312] 2012-05-14 14:47:25 -05:00
Rafael Mendonça França
1839ecd228 MySQL doesn't allow default values for blobs. 2012-05-13 20:12:00 -03:00
Rafael Mendonça França
9b40f5cc36 Copy edit [ci skip] 2012-05-13 19:04:33 -03:00
Rafael Mendonça França
f443e119cd Merge pull request #5807 from Antiarchitect/store-improvement
Custom coders support for ActiveRecord::Store.
2012-05-13 15:02:31 -07:00
Francesco Rodriguez
53b12cfd2e fix todo: use minitest skip instead of return nil 2012-05-13 02:27:52 -05:00
Rafael Mendonça França
871b1c2115 Merge pull request #6193 from mhfs/fix_oracle_spec
Fix failing AR test on Oracle
2012-05-12 16:34:36 -07:00
Vijay Dev
b2b815899b fixes a nodoc which swallowed the documentation for the rest of the methods [ci skip] 2012-05-12 19:41:29 +05:30
Vijay Dev
2c8b4a514c Merge pull request #6285 from acapilleri/missplelling_error_in_abstract_mysql_adapter
missplelling error in abstract_mysql_adapter
2012-05-12 06:46:14 -07:00
Vijay Dev
70237e7dd3 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activesupport/lib/active_support/callbacks.rb
2012-05-12 19:10:49 +05:30
Angelo Capilleri
984bc75fe6 missplelling error in abstract_mysql_adapter 2012-05-12 15:39:40 +02:00
Vijay Dev
f2f6534272 s/wether/whether [ci skip] 2012-05-12 19:08:19 +05:30
Vijay Dev
84d198b4a0 copy edits [ci skip] 2012-05-12 18:10:08 +05:30
angelo giovanni capilleri
47570d4f1f mispelling errors in render_text_test.rb and sqlite_specific_schema 2012-05-12 13:19:28 +02:00
Erich Menge
7dba51288f Better document the difference between #clone and #dup.
Add #nodoc to initialize_dup and use :method: to document the #dup method.
Relates to issue #6235
2012-05-11 18:51:01 -05:00
Jon Leighton
2091e5a65e Remove #=== quirk
Makes it consistent with Relation. Can't see a use for this.
2012-05-11 23:44:55 +01:00
Santiago Pastorino
a00228c1a3 Lazy load I18n 2012-05-11 19:00:25 -03:00
Jon Leighton
ecef5a9f22 this stuff can all be handled by Relation 2012-05-11 20:11:04 +01:00
Jon Leighton
be7c6ee56d extract deprecated code 2012-05-11 20:11:04 +01:00
Jon Leighton
8f50bbee31 set_owner_attributes is covered by the scoping 2012-05-11 20:11:04 +01:00
Jon Leighton
c86a32d745 CollectionProxy < Relation
This helps bring the interfaces of CollectionProxy and Relation closer
together, and reduces the delegation backflips we need to perform.

For example, first_or_create is defined thus:

class ActiveRecord::Relation
  def first_or_create(...)
    first || create(...)
  end
end

If CollectionProxy < Relation, then post.comments.first_or_create will
hit the association's #create method which will actually add the new record
to the association, just as post.comments.create would.

With the previous delegation, post.comments.first_or_create expands to
post.comments.scoped.first_or_create, where post.comments.scoped has no
knowledge of the association.
2012-05-11 20:11:04 +01:00
Hrvoje Šimić
1b956700ee better wording 2012-05-11 16:27:21 +02:00
Hrvoje Šimić
bd2b1c126b missing 'with' 2012-05-11 16:09:10 +02:00
Andrew White
fa21b73ebb Return false for exists? with new records - fixes #6199. 2012-05-10 23:16:40 +01:00
Vijay Dev
5277d550d9 remove unnecessary 'examples' noise [ci skip] 2012-05-11 00:29:39 +05:30
Jeremy Kemper
42a14c436c Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb
Rename variables and remove unused code in fixtures.rb
2012-05-09 19:01:03 -07:00
Piotr Sarnacki
ea40990f4b Allow to run connection_adapters/quoting_test.rb independently 2012-05-09 17:08:36 -07:00
Aaron Patterson
df0324f7dd Merge pull request #5362 from zenprogrammer/quoting_bug
Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
2012-05-09 16:12:07 -07:00
Alexey Muranov
12ceb4581a Rename some variables
Rename some parameters and instance and local variables, mostly in fixtures.rb.  Also remove an unused assignment to an instance variable.

There are minor code changes.
2012-05-09 18:46:13 +02:00
Andrey Voronkov
3c0bf0435c Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be used out of the box. 2012-05-09 19:20:14 +04:00