Skip to content

Commit 9add760

Browse files
committed
remove deprecated set and original methods for table_name, primary_key, etc
1 parent abdb105 commit 9add760

File tree

5 files changed

+1
-276
lines changed

5 files changed

+1
-276
lines changed

activerecord/lib/active_record/attribute_methods/primary_key.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ def get_primary_key(base_name) #:nodoc:
8080
end
8181
end
8282

83-
def original_primary_key #:nodoc:
84-
deprecated_original_property_getter :primary_key
85-
end
86-
8783
# Sets the name of the primary key column.
8884
#
8985
# class Project < ActiveRecord::Base
@@ -103,11 +99,6 @@ def primary_key=(value)
10399
@primary_key = value && value.to_s
104100
@quoted_primary_key = nil
105101
end
106-
107-
def set_primary_key(value = nil, &block) #:nodoc:
108-
deprecated_property_setter :primary_key, value, block
109-
@quoted_primary_key = nil
110-
end
111102
end
112103
end
113104
end

activerecord/lib/active_record/locking/optimistic.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,26 +144,18 @@ def locking_enabled?
144144
lock_optimistically && columns_hash[locking_column]
145145
end
146146

147+
# Set the column to use for optimistic locking. Defaults to +lock_version+.
147148
def locking_column=(value)
148149
@original_locking_column = @locking_column if defined?(@locking_column)
149150
@locking_column = value.to_s
150151
end
151152

152-
# Set the column to use for optimistic locking. Defaults to +lock_version+.
153-
def set_locking_column(value = nil, &block)
154-
deprecated_property_setter :locking_column, value, block
155-
end
156-
157153
# The version column used for optimistic locking. Defaults to +lock_version+.
158154
def locking_column
159155
reset_locking_column unless defined?(@locking_column)
160156
@locking_column
161157
end
162158

163-
def original_locking_column #:nodoc:
164-
deprecated_original_property_getter :locking_column
165-
end
166-
167159
# Quote the column name used for optimistic locking.
168160
def quoted_locking_column
169161
connection.quote_column_name(locking_column)

activerecord/lib/active_record/model_schema.rb

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ def table_name
105105
@table_name
106106
end
107107

108-
def original_table_name #:nodoc:
109-
deprecated_original_property_getter :table_name
110-
end
111-
112108
# Sets the table name explicitly. Example:
113109
#
114110
# class Project < ActiveRecord::Base
@@ -125,13 +121,6 @@ def table_name=(value)
125121
@relation = Relation.new(self, arel_table)
126122
end
127123

128-
def set_table_name(value = nil, &block) #:nodoc:
129-
deprecated_property_setter :table_name, value, block
130-
@quoted_table_name = nil
131-
@arel_table = nil
132-
@relation = Relation.new(self, arel_table)
133-
end
134-
135124
# Returns a quoted version of the table name, used to construct SQL statements.
136125
def quoted_table_name
137126
@quoted_table_name ||= connection.quote_table_name(table_name)
@@ -161,20 +150,12 @@ def inheritance_column
161150
end
162151
end
163152

164-
def original_inheritance_column #:nodoc:
165-
deprecated_original_property_getter :inheritance_column
166-
end
167-
168153
# Sets the value of inheritance_column
169154
def inheritance_column=(value)
170155
@original_inheritance_column = inheritance_column
171156
@inheritance_column = value.to_s
172157
end
173158

174-
def set_inheritance_column(value = nil, &block) #:nodoc:
175-
deprecated_property_setter :inheritance_column, value, block
176-
end
177-
178159
def sequence_name
179160
if base_class == self
180161
@sequence_name ||= reset_sequence_name
@@ -183,10 +164,6 @@ def sequence_name
183164
end
184165
end
185166

186-
def original_sequence_name #:nodoc:
187-
deprecated_original_property_getter :sequence_name
188-
end
189-
190167
def reset_sequence_name #:nodoc:
191168
self.sequence_name = connection.default_sequence_name(table_name, primary_key)
192169
end
@@ -210,10 +187,6 @@ def sequence_name=(value)
210187
@sequence_name = value.to_s
211188
end
212189

213-
def set_sequence_name(value = nil, &block) #:nodoc:
214-
deprecated_property_setter :sequence_name, value, block
215-
end
216-
217190
# Indicates whether the table associated with this class exists
218191
def table_exists?
219192
connection.schema_cache.table_exists?(table_name)
@@ -329,34 +302,6 @@ def compute_table_name
329302
base.table_name
330303
end
331304
end
332-
333-
def deprecated_property_setter(property, value, block)
334-
if block
335-
ActiveSupport::Deprecation.warn(
336-
"Calling set_#{property} is deprecated. If you need to lazily evaluate " \
337-
"the #{property}, define your own `self.#{property}` class method. You can use `super` " \
338-
"to get the default #{property} where you would have called `original_#{property}`."
339-
)
340-
341-
define_attr_method property, value, false, &block
342-
else
343-
ActiveSupport::Deprecation.warn(
344-
"Calling set_#{property} is deprecated. Please use `self.#{property} = 'the_name'` instead."
345-
)
346-
347-
define_attr_method property, value, false
348-
end
349-
end
350-
351-
def deprecated_original_property_getter(property)
352-
ActiveSupport::Deprecation.warn("original_#{property} is deprecated. Define self.#{property} and call super instead.")
353-
354-
if !instance_variable_defined?("@original_#{property}") && respond_to?("reset_#{property}")
355-
send("reset_#{property}")
356-
else
357-
instance_variable_get("@original_#{property}")
358-
end
359-
end
360305
end
361306
end
362307
end

activerecord/test/cases/base_test.rb

Lines changed: 0 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,17 +1383,6 @@ def test_reload_with_exclusive_scope
13831383
assert_equal dev, dev.reload
13841384
end
13851385

1386-
def test_set_table_name_with_value
1387-
k = Class.new( ActiveRecord::Base )
1388-
k.table_name = "foo"
1389-
assert_equal "foo", k.table_name
1390-
1391-
assert_deprecated do
1392-
k.set_table_name "bar"
1393-
end
1394-
assert_equal "bar", k.table_name
1395-
end
1396-
13971386
def test_switching_between_table_name
13981387
assert_difference("GoodJoke.count") do
13991388
Joke.table_name = "cold_jokes"
@@ -1416,163 +1405,13 @@ def test_quoted_table_name_after_set_table_name
14161405
assert_equal klass.connection.quote_table_name("bar"), klass.quoted_table_name
14171406
end
14181407

1419-
def test_set_table_name_with_block
1420-
k = Class.new( ActiveRecord::Base )
1421-
assert_deprecated do
1422-
k.set_table_name "foo"
1423-
k.set_table_name do
1424-
ActiveSupport::Deprecation.silence { original_table_name } + "ks"
1425-
end
1426-
end
1427-
assert_equal "fooks", k.table_name
1428-
end
1429-
14301408
def test_set_table_name_with_inheritance
14311409
k = Class.new( ActiveRecord::Base )
14321410
def k.name; "Foo"; end
14331411
def k.table_name; super + "ks"; end
14341412
assert_equal "foosks", k.table_name
14351413
end
14361414

1437-
def test_original_table_name
1438-
k = Class.new(ActiveRecord::Base)
1439-
def k.name; "Foo"; end
1440-
k.table_name = "bar"
1441-
1442-
assert_deprecated do
1443-
assert_equal "foos", k.original_table_name
1444-
end
1445-
1446-
k = Class.new(ActiveRecord::Base)
1447-
k.table_name = "omg"
1448-
k.table_name = "wtf"
1449-
1450-
assert_deprecated do
1451-
assert_equal "omg", k.original_table_name
1452-
end
1453-
end
1454-
1455-
def test_set_primary_key_with_value
1456-
k = Class.new( ActiveRecord::Base )
1457-
k.primary_key = "foo"
1458-
assert_equal "foo", k.primary_key
1459-
1460-
assert_deprecated do
1461-
k.set_primary_key "bar"
1462-
end
1463-
assert_equal "bar", k.primary_key
1464-
end
1465-
1466-
def test_set_primary_key_with_block
1467-
k = Class.new( ActiveRecord::Base )
1468-
k.primary_key = 'id'
1469-
1470-
assert_deprecated do
1471-
k.set_primary_key do
1472-
"sys_" + ActiveSupport::Deprecation.silence { original_primary_key }
1473-
end
1474-
end
1475-
assert_equal "sys_id", k.primary_key
1476-
end
1477-
1478-
def test_original_primary_key
1479-
k = Class.new(ActiveRecord::Base)
1480-
def k.name; "Foo"; end
1481-
k.table_name = "posts"
1482-
k.primary_key = "bar"
1483-
1484-
assert_deprecated do
1485-
assert_equal "id", k.original_primary_key
1486-
end
1487-
1488-
k = Class.new(ActiveRecord::Base)
1489-
k.primary_key = "omg"
1490-
k.primary_key = "wtf"
1491-
1492-
assert_deprecated do
1493-
assert_equal "omg", k.original_primary_key
1494-
end
1495-
end
1496-
1497-
def test_set_inheritance_column_with_value
1498-
k = Class.new( ActiveRecord::Base )
1499-
k.inheritance_column = "foo"
1500-
assert_equal "foo", k.inheritance_column
1501-
1502-
assert_deprecated do
1503-
k.set_inheritance_column "bar"
1504-
end
1505-
assert_equal "bar", k.inheritance_column
1506-
end
1507-
1508-
def test_set_inheritance_column_with_block
1509-
k = Class.new( ActiveRecord::Base )
1510-
assert_deprecated do
1511-
k.set_inheritance_column do
1512-
ActiveSupport::Deprecation.silence { original_inheritance_column } + "_id"
1513-
end
1514-
end
1515-
assert_equal "type_id", k.inheritance_column
1516-
end
1517-
1518-
def test_original_inheritance_column
1519-
k = Class.new(ActiveRecord::Base)
1520-
def k.name; "Foo"; end
1521-
k.inheritance_column = "omg"
1522-
1523-
assert_deprecated do
1524-
assert_equal "type", k.original_inheritance_column
1525-
end
1526-
end
1527-
1528-
def test_set_sequence_name_with_value
1529-
k = Class.new( ActiveRecord::Base )
1530-
k.sequence_name = "foo"
1531-
assert_equal "foo", k.sequence_name
1532-
1533-
assert_deprecated do
1534-
k.set_sequence_name "bar"
1535-
end
1536-
assert_equal "bar", k.sequence_name
1537-
end
1538-
1539-
def test_set_sequence_name_with_block
1540-
k = Class.new( ActiveRecord::Base )
1541-
k.table_name = "projects"
1542-
orig_name = k.sequence_name
1543-
return skip "sequences not supported by db" unless orig_name
1544-
1545-
assert_deprecated do
1546-
k.set_sequence_name do
1547-
ActiveSupport::Deprecation.silence { original_sequence_name } + "_lol"
1548-
end
1549-
end
1550-
assert_equal orig_name + "_lol", k.sequence_name
1551-
end
1552-
1553-
def test_original_sequence_name
1554-
k = Class.new(ActiveRecord::Base)
1555-
k.table_name = "projects"
1556-
orig_name = k.sequence_name
1557-
return skip "sequences not supported by db" unless orig_name
1558-
1559-
k = Class.new(ActiveRecord::Base)
1560-
k.table_name = "projects"
1561-
k.sequence_name = "omg"
1562-
1563-
assert_deprecated do
1564-
assert_equal orig_name, k.original_sequence_name
1565-
end
1566-
1567-
k = Class.new(ActiveRecord::Base)
1568-
k.table_name = "projects"
1569-
k.sequence_name = "omg"
1570-
k.sequence_name = "wtf"
1571-
assert_deprecated do
1572-
assert_equal "omg", k.original_sequence_name
1573-
end
1574-
end
1575-
15761415
def test_sequence_name_with_abstract_class
15771416
ak = Class.new(ActiveRecord::Base)
15781417
ak.abstract_class = true

activerecord/test/cases/locking_test.rb

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -226,48 +226,6 @@ def test_update_without_attributes_does_not_only_update_lock_version
226226
end
227227
end
228228

229-
class SetLockingColumnTest < ActiveRecord::TestCase
230-
def test_set_set_locking_column_with_value
231-
k = Class.new( ActiveRecord::Base )
232-
k.locking_column = "foo"
233-
assert_equal "foo", k.locking_column
234-
235-
assert_deprecated do
236-
k.set_locking_column "bar"
237-
end
238-
assert_equal "bar", k.locking_column
239-
end
240-
241-
def test_set_locking_column_with_block
242-
k = Class.new( ActiveRecord::Base )
243-
k.locking_column = 'foo'
244-
245-
assert_deprecated do
246-
k.set_locking_column do
247-
"lock_" + ActiveSupport::Deprecation.silence { original_locking_column }
248-
end
249-
end
250-
assert_equal "lock_foo", k.locking_column
251-
end
252-
253-
def test_original_locking_column
254-
k = Class.new(ActiveRecord::Base)
255-
k.locking_column = "bar"
256-
257-
assert_deprecated do
258-
assert_equal ActiveRecord::Locking::Optimistic::ClassMethods::DEFAULT_LOCKING_COLUMN, k.original_locking_column
259-
end
260-
261-
k = Class.new(ActiveRecord::Base)
262-
k.locking_column = "omg"
263-
k.locking_column = "wtf"
264-
265-
assert_deprecated do
266-
assert_equal "omg", k.original_locking_column
267-
end
268-
end
269-
end
270-
271229
class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase
272230
fixtures :people, :legacy_things, :references
273231

0 commit comments

Comments
 (0)