Permalink
Browse files

Reversing fix to 2.9.0

  • Loading branch information...
wishdev committed Jan 23, 2009
1 parent a2abbe5 commit 184c4d2b1dba2c89e71c2484b8984172d3e81b01
Showing with 5 additions and 6 deletions.
  1. +5 −6 lib/sequel_core/adapters/firebird.rb
@@ -4,10 +4,9 @@ module Sequel
# The Sequel Firebird adapter requires the ruby fb driver located at
# http://github.com/wishdev/fb.
module Firebird
-
class Database < Sequel::Database
-
set_adapter_scheme :firebird
+
AUTO_INCREMENT = ''.freeze
# Add the primary_keys and primary_key_sequences instance variables,
@@ -66,9 +65,9 @@ def create_sequence_sql(name, opts={})
# See Schema::Generator.
# Firebird gets an override because of the mess of creating a
# generator for auto-incrementing primary keys.
- def create_table(name, options={}, &block)
- options = {:generator=>options} if options.is_a?(Schema::Generator)
- statements = create_table_sql_list(name, *((options[:generator] ||= Schema::Generator.new(self, &block)).create_info << options))
+ def create_table(name, generator=nil, &block)
+ generator ||= Schema::Generator.new(self, &block)
+ statements = create_table_sql_list(name, *generator.create_info)
begin
execute_ddl(statements[1])
rescue
@@ -77,7 +76,7 @@ def create_table(name, options={}, &block)
statements[0].flatten.each {|sql| execute_ddl(sql)}
end
- def create_table_sql_list(name, columns, indexes = nil, options={})
+ def create_table_sql_list(name, columns, indexes = nil)
statements = super
drop_seq_statement = nil
columns.each do |c|

0 comments on commit 184c4d2

Please sign in to comment.