Merge pull request #244 from laskaridis/master
Fixes missing #uses_sequence invokation in adapter classes for sqlite and sqlite3
This commit is contained in:
commit
df55cf7b74
|
@ -53,7 +53,7 @@ module DataMapper
|
||||||
|
|
||||||
def truncate_table(table_name)
|
def truncate_table(table_name)
|
||||||
execute("DELETE FROM #{quote_name(table_name)};")
|
execute("DELETE FROM #{quote_name(table_name)};")
|
||||||
if uses_sequence
|
if uses_sequence?
|
||||||
execute("DELETE FROM sqlite_sequence where name = '#{table_name}';")
|
execute("DELETE FROM sqlite_sequence where name = '#{table_name}';")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -65,6 +65,16 @@ module DataMapper
|
||||||
yield
|
yield
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def uses_sequence?
|
||||||
|
sql = <<-SQL
|
||||||
|
SELECT name FROM sqlite_master
|
||||||
|
WHERE type='table' AND name='sqlite_sequence'
|
||||||
|
SQL
|
||||||
|
select(sql).first
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class SqliteAdapter < DataObjectsAdapter
|
class SqliteAdapter < DataObjectsAdapter
|
||||||
|
@ -82,7 +92,7 @@ module DataMapper
|
||||||
|
|
||||||
def truncate_table(table_name)
|
def truncate_table(table_name)
|
||||||
execute("DELETE FROM #{quote_name(table_name)};")
|
execute("DELETE FROM #{quote_name(table_name)};")
|
||||||
if uses_sequence
|
if uses_sequence?
|
||||||
execute("DELETE FROM sqlite_sequence where name = '#{table_name}';")
|
execute("DELETE FROM sqlite_sequence where name = '#{table_name}';")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -94,6 +104,16 @@ module DataMapper
|
||||||
yield
|
yield
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def uses_sequence?
|
||||||
|
sql = <<-SQL
|
||||||
|
SELECT name FROM sqlite_master
|
||||||
|
WHERE type='table' AND name='sqlite_sequence'
|
||||||
|
SQL
|
||||||
|
select(sql).first
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# FIXME
|
# FIXME
|
||||||
|
|
Loading…
Reference in New Issue