9921 Commits

Author SHA1 Message Date
Jeremy Kemper
326188c25e 2.3.7 release: fix rails_xss compatibility v2.3.7 2010-05-24 00:04:41 -07:00
Jeremy Kemper
60e82a3ca2 Move tests for deprecated String#html_safe! to plugin 2010-05-23 22:07:47 -07:00
Jeremy Kemper
3ff921a65a rails_xss handles deprecated String html safety, when installed 2010-05-23 21:30:43 -07:00
Santiago Pastorino
b10bf834b7 Make use of safe_concat on TextHelper concat
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-23 16:51:52 -07:00
Jeremy Kemper
86f0287993 Revert "Don't always mark the argument to #concat as HTML-safe."
This reverts commit e53791f8c0.
2010-05-23 16:51:47 -07:00
Jeremy Kemper
ab2d7c8b5d Use a non-XSS-protected output buffer for view tests 2010-05-23 16:21:44 -07:00
Jeremy Kemper
ca5f5d97b9 Fix test rendering unmarked but safe HTML 2010-05-23 15:28:40 -07:00
Nathan Weizenbaum
e3f14d12cd Don't incompatibly monkeypatch ERB.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-23 15:02:24 -07:00
Nathan Weizenbaum
e53791f8c0 Don't always mark the argument to #concat as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-23 15:00:14 -07:00
Nathan Weizenbaum
48fbe7b0d8 Mark all raw HTML being concatted as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-23 14:57:45 -07:00
Jeremy Kemper
55e88eeee4 Bump 2-3-stable to 2.3.7 2010-05-23 01:39:45 -07:00
Jeremy Kemper
56bb5504dd 2.3.6 release v2.3.6 2010-05-22 23:53:40 -07:00
Jeremy Kemper
d8f0a58dcb Remove miscommit from 57337cd 2010-05-22 23:46:03 -07:00
Aaron Patterson
a637b5f447 backporting beda2d43 for newer sqlite-ruby bindings
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-05-22 20:52:15 +02:00
Xavier Noria
25ec61330b 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year) 2010-05-19 00:59:02 +02:00
Jeremy Kemper
9d99e610be Revert "Don't carry default value when changing column for a binary type on MySQL"
Broke mysql tests.

This reverts commit ddadcc7cf8.

Conflicts:

	activerecord/test/cases/migration_test.rb

[#3234 state:open]
2010-05-18 11:03:59 -07:00
Étienne Barrié
99bcce7ec1 make add_index and remove_index more resilient; new rename_index method; track database limits
[#3452 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-18 10:51:36 -07:00
Ian White
a5696e36c6 Nested records (re: autosave) are now updated even when the intermediate parent record is unchanged [#4242]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-18 16:10:44 +02:00
José Valim
94878c61a3 Deprecate legacy CGI options in SessionStores. 2010-05-18 03:25:57 +02:00
Xavier Noria
bb2327d9ab method rename to fix a broken test 2010-05-18 00:31:41 +02:00
Rizwan Reza
32b0b5f7b2 Deprecate Array#rand in favor of Array#random_element [#4555 stated:committed]
Signed-off-by: Xavier Noria <fxn@hashref.com>
2010-05-17 23:56:44 +02:00
José Valim
76608b13d2 superclass_delegating_accessor does not accept options. 2010-05-17 12:37:42 +02:00
Jeremy Kemper
cd3d30d569 CI: bump rack to 1.1 2010-05-16 13:35:42 -07:00
Rizwan Reza
74206aeff2 Rack dependency bumped to 1.1.0, tests passing. [#3558 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 22:19:25 +02:00
Wijnand Wiersma
5b1f4c51ce Postgresql doesn't allow to change a string type column to a binary type. Skip this test for postgresql for now.
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 15:15:16 +02:00
Jeff Kreeftmeijer
ec017e158a Added assert_attribute_type to clean up GeneratedAttributeTest [#2377 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 12:08:55 +02:00
Matthew Rudy Jacobs
5d979de1a9 when we run rake rails:freeze:edge update the value of the "REVISION" file rather than creating a new file "REVISION_ce706..." each time [#1694 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 10:42:48 +02:00
Nobuhiro IMAI
e535b45c86 make fixture accessors private
prevent to be run fixture accessor (e.g. test_foos for TestFoo model) as a test case

Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 10:35:23 +02:00
Neeraj Singh
3570f3e7f6 Fix broken integration test in 2.x [#4565 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 10:32:53 +02:00
Jeff Kreeftmeijer
3568c5cee0 using :time_select when the attribute type is :time in the scaffold generator. [#2377 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 10:32:15 +02:00
Elomar França
ddadcc7cf8 Don't carry default value when changing column for a binary type on MySQL [#3234 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 10:30:47 +02:00
Lawrence Pit
0706bdce60 docs + test for each_error
[#3185 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-15 11:49:04 -07:00
Jeff Kreeftmeijer
5d7ad7ba41 make sure as is set before trying to build an #{as}_counter. [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-15 11:18:31 -07:00
Neeraj Singh
22b020db3e db:drop:all throws error when database does not exist [#2997 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-15 10:33:52 -07:00
Jeff Kreeftmeijer
2de364636c partial counters with :as [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-15 10:32:45 -07:00
Josh Kalderimis
8e7a64d090 backported AR correction to find_each and find_in_batches to raise when the user uses select but does not specify the primary key
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-15 09:51:58 +02:00
José Valim
6949d6f54f Remove deprecated tests according to 8e679f1 2010-05-14 23:43:21 +02:00
Santiago Pastorino
c4ef7bb2a0 to_json and to_xml tests added to ActiveResource
[#4529 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-12 13:40:09 -07:00
Pratik Naik
7cbc546d39 Use superclass_delegating_accessor for connection handlers 2010-05-12 17:43:02 +01:00
Jeremy Kemper
9ab1154523 Drop require removed by 8e679f1 2010-05-11 22:39:53 -07:00
Santiago Pastorino
ad73a3aec4 type_cast_calculated_value refactor: value is never a Fixnum here. Fix test since SQLite returns Float.
[#4514 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-11 22:28:36 -07:00
José Valim
8e679f1854 Remove i18n interpolation deprecation. It has been around since 2.2. 2010-05-11 22:13:03 +02:00
Pratik Naik
3c1bb40b6b Make sure schema dumper doesnt throw up when there are no index lengths 2010-05-09 12:42:15 +01:00
Pratik Naik
77adb4bc20 Revert "Revert "Add index length support for MySQL [#1852 state:resolved]" (breaks the build)"
This reverts commit eababa35cf.
2010-05-09 12:34:07 +01:00
Carl Lerche
eababa35cf Revert "Add index length support for MySQL [#1852 state:resolved]" (breaks the build)
This reverts commit 3616141fa2.
2010-05-08 23:56:06 +03:00
Santiago Pastorino
555801c908 The intention here was to assign to different objects ht: Radar 2010-05-08 23:34:07 +03:00
Emili Parreno
3616141fa2 Add index length support for MySQL [#1852 state:resolved]
Example:

  add_index(:accounts, :name, :name => 'by_name', :length => 10)
  => CREATE INDEX by_name ON accounts(name(10))

  add_index(:accounts, [:name, :surname], :name => 'by_name_surname', :length => {:name => 10, :surname => 15})
  => CREATE INDEX by_name_surname ON accounts(name(10), surname(15))

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2010-05-08 12:43:34 +01:00
Santiago Pastorino
f967b352d2 Make find_or_create and find_or_initialize work mixing explicit parameters and a hash. ht: Marc-André Lafortune
[#4457 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-07 13:29:51 -07:00
Santiago Pastorino
adcfb4e8bd simple_format should return html_safe but not escape text, that's for rails_xss plugin [#3767 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-07 11:56:53 -07:00
Brian Lopez
6d1344de5e add support for mysql2 adapter to dbconsole
[#4532 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-04 15:47:12 -07:00