aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-12-03 16:07:28 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-03 16:07:28 -0800
commitac6296ab8f9d38dbfa8149eb0c6e16d6957dd519 (patch)
tree9589191765c41c75c8ee6d6694b17a7676f11cb9
parent7b3e8d67943c091d24ee4e4129a9b1892b7c7e6f (diff)
downloadrails-ac6296ab8f9d38dbfa8149eb0c6e16d6957dd519.tar.gz
rails-ac6296ab8f9d38dbfa8149eb0c6e16d6957dd519.tar.bz2
rails-ac6296ab8f9d38dbfa8149eb0c6e16d6957dd519.zip
only break backwards compatibility in major releases
-rw-r--r--History.txt6
-rw-r--r--lib/arel/crud.rb6
-rw-r--r--lib/arel/select_manager.rb2
-rw-r--r--lib/arel/table.rb6
4 files changed, 10 insertions, 10 deletions
diff --git a/History.txt b/History.txt
index 59fce7f4d4..d3172f4162 100644
--- a/History.txt
+++ b/History.txt
@@ -15,13 +15,13 @@
* Calls to `delete` are deprecated. Please use `compile_delete` then call
`to_sql` on the resulting object and execute that SQL.
- * Arel::Table#joins is deprecated and will be removed in 2.2.0 with no
+ * Arel::Table#joins is deprecated and will be removed in 3.0.0 with no
replacement.
- * Arel::Table#columns is deprecated and will be removed in 2.2.0 with no
+ * Arel::Table#columns is deprecated and will be removed in 3.0.0 with no
replacement.
- * Arel::Table.table_cache is deprecated and will be removed in 2.2.0 with no
+ * Arel::Table.table_cache is deprecated and will be removed in 3.0.0 with no
replacement.
== 2.0.6 12/01/2010
diff --git a/lib/arel/crud.rb b/lib/arel/crud.rb
index ade1b9f424..ec58734456 100644
--- a/lib/arel/crud.rb
+++ b/lib/arel/crud.rb
@@ -22,7 +22,7 @@ module Arel
def update values
if $VERBOSE
warn <<-eowarn
-update (#{caller.first}) is deprecated and will be removed in ARel 2.2.0. Please
+update (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
switch to `compile_update`
eowarn
end
@@ -41,7 +41,7 @@ switch to `compile_update`
def insert values
if $VERBOSE
warn <<-eowarn
-insert (#{caller.first}) is deprecated and will be removed in ARel 2.2.0. Please
+insert (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
switch to `compile_insert`
eowarn
end
@@ -58,7 +58,7 @@ switch to `compile_insert`
def delete
if $VERBOSE
warn <<-eowarn
-delete (#{caller.first}) is deprecated and will be removed in ARel 2.2.0. Please
+delete (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
switch to `compile_delete`
eowarn
end
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 2bc7dbf1ec..de12402e9f 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -155,7 +155,7 @@ module Arel
def joins manager
if $VERBOSE
- warn "joins is deprecated and will be removed in 2.2"
+ warn "joins is deprecated and will be removed in 3.0.0"
warn "please remove your call to joins from #{caller.first}"
end
manager.join_sql
diff --git a/lib/arel/table.rb b/lib/arel/table.rb
index 79c9b60945..e7a626a4c6 100644
--- a/lib/arel/table.rb
+++ b/lib/arel/table.rb
@@ -45,7 +45,7 @@ module Arel
def joins manager
if $VERBOSE
- warn "joins is deprecated and will be removed in 2.2"
+ warn "joins is deprecated and will be removed in 3.0.0"
warn "please remove your call to joins from #{caller.first}"
end
nil
@@ -95,7 +95,7 @@ module Arel
if $VERBOSE
warn <<-eowarn
(#{caller.first}) Arel::Table#columns is deprecated and will be removed in
-Arel 2.2.0 with no replacement. PEW PEW PEW!!!
+Arel 3.0.0 with no replacement. PEW PEW PEW!!!
eowarn
end
@columns ||=
@@ -129,7 +129,7 @@ Arel 2.2.0 with no replacement. PEW PEW PEW!!!
if $VERBOSE
warn <<-eowarn
(#{caller.first}) Arel::Table.table_cache is deprecated and will be removed in
-Arel 2.2.0 with no replacement. PEW PEW PEW!!!
+Arel 3.0.0 with no replacement. PEW PEW PEW!!!
eowarn
end
@@table_cache ||= Hash[engine.connection.tables.map { |x| [x,true] }]