Remove default_primary_key_type
and extract contains of native_database_types
to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
This commit is contained in:
parent
c05f9558ee
commit
4f381734e2
@ -55,6 +55,21 @@ def binary_to_string(value)
|
||||
class SQLite3Adapter < AbstractAdapter
|
||||
include Savepoints
|
||||
|
||||
NATIVE_DATABASE_TYPES = {
|
||||
primary_key: 'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL',
|
||||
string: { name: "varchar", limit: 255 },
|
||||
text: { name: "text" },
|
||||
integer: { name: "integer" },
|
||||
float: { name: "float" },
|
||||
decimal: { name: "decimal" },
|
||||
datetime: { name: "datetime" },
|
||||
timestamp: { name: "datetime" },
|
||||
time: { name: "time" },
|
||||
date: { name: "date" },
|
||||
binary: { name: "blob" },
|
||||
boolean: { name: "boolean" }
|
||||
}
|
||||
|
||||
class Version
|
||||
include Comparable
|
||||
|
||||
@ -195,20 +210,7 @@ def allowed_index_name_length
|
||||
end
|
||||
|
||||
def native_database_types #:nodoc:
|
||||
{
|
||||
:primary_key => default_primary_key_type,
|
||||
:string => { :name => "varchar", :limit => 255 },
|
||||
:text => { :name => "text" },
|
||||
:integer => { :name => "integer" },
|
||||
:float => { :name => "float" },
|
||||
:decimal => { :name => "decimal" },
|
||||
:datetime => { :name => "datetime" },
|
||||
:timestamp => { :name => "datetime" },
|
||||
:time => { :name => "time" },
|
||||
:date => { :name => "date" },
|
||||
:binary => { :name => "blob" },
|
||||
:boolean => { :name => "boolean" }
|
||||
}
|
||||
NATIVE_DATABASE_TYPES
|
||||
end
|
||||
|
||||
# Returns the current database encoding format as a string, eg: 'UTF-8'
|
||||
@ -591,10 +593,6 @@ def sqlite_version
|
||||
@sqlite_version ||= SQLite3Adapter::Version.new(select_value('select sqlite_version(*)'))
|
||||
end
|
||||
|
||||
def default_primary_key_type
|
||||
'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL'
|
||||
end
|
||||
|
||||
def translate_exception(exception, message)
|
||||
case exception.message
|
||||
when /column(s)? .* (is|are) not unique/
|
||||
|
Loading…
Reference in New Issue
Block a user