Skip to content

Commit bba8bb8

Browse files
committed
Merge pull request rails#11921 from Empact/sqlite-3-cleanup
Remove the unused, undocumented SQLite3Adapter#supports_count_distinct?
2 parents 98991a9 + a7394a2 commit bba8bb8

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@ def supports_ddl_transactions?
631631
true
632632
end
633633

634-
# Returns true.
635634
def supports_explain?
636635
true
637636
end

activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,12 @@ def adapter_name #:nodoc:
141141
'SQLite'
142142
end
143143

144-
# Returns true
145144
def supports_ddl_transactions?
146145
true
147146
end
148147

149-
# Returns true if SQLite version is '3.6.8' or greater, false otherwise.
150148
def supports_savepoints?
151-
sqlite_version >= '3.6.8'
149+
true
152150
end
153151

154152
# Returns true, since this connection adapter supports prepared statement
@@ -162,7 +160,6 @@ def supports_migrations? #:nodoc:
162160
true
163161
end
164162

165-
# Returns true.
166163
def supports_primary_key? #:nodoc:
167164
true
168165
end
@@ -171,7 +168,6 @@ def requires_reloading?
171168
true
172169
end
173170

174-
# Returns true
175171
def supports_add_column?
176172
true
177173
end
@@ -193,11 +189,6 @@ def clear_cache!
193189
@statements.clear
194190
end
195191

196-
# Returns true
197-
def supports_count_distinct? #:nodoc:
198-
true
199-
end
200-
201192
def supports_index_sort_order?
202193
true
203194
end
@@ -218,7 +209,6 @@ def encoding
218209
@connection.encoding.to_s
219210
end
220211

221-
# Returns true.
222212
def supports_explain?
223213
true
224214
end

0 commit comments

Comments
 (0)