sequel 4.23.0 → 4.24.0

data/spec/extensions/pg_inet_ops_spec.rb

@@ -0,0 +1,101 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+Sequel.extension :pg_inet_ops
+
+describe "Sequel::Postgres::InetOp" do
+  before do
+    db = Sequel.connect('mock://postgres', :quote_identifiers=>false)
+    db.extension :pg_inet
+    @ds = db.dataset
+    @h = Sequel.pg_inet_op(:h)
+  end
+
+  it "#pg_inet should return self" do
+    @h.pg_inet.must_be_same_as(@h)
+  end
+
+  it "Sequel.pg_inet_op should return argument if already an InetOp" do
+    Sequel.pg_inet_op(@h).must_be_same_as(@h)
+  end
+
+  it "#pg_inet should return a InetOp for literal strings, and expressions" do
+    @ds.literal(Sequel.function(:b, :h).pg_inet.abbrev).must_equal "abbrev(b(h))"
+    @ds.literal(Sequel.lit('h').pg_inet.abbrev).must_equal "abbrev(h)"
+  end
+
+  it "should define methods for all of the PostgreSQL inet operators" do
+    @ds.literal(@h + @h).must_equal "(h + h)"
+    @ds.literal(@h - @h).must_equal "(h - h)"
+    @ds.literal(@h << @h).must_equal "(h << h)"
+    @ds.literal(@h >> @h).must_equal "(h >> h)"
+    @ds.literal(@h & @h).must_equal "(h & h)"
+    @ds.literal(@h | @h).must_equal "(h | h)"
+    @ds.literal(~@h).must_equal "~h"
+
+    @ds.literal(@h.contained_by(@h)).must_equal "(h << h)"
+    @ds.literal(@h.contained_by_or_equals(@h)).must_equal "(h <<= h)"
+    @ds.literal(@h.contains(@h)).must_equal "(h >> h)"
+    @ds.literal(@h.contains_or_equals(@h)).must_equal "(h >>= h)"
+    @ds.literal(@h.contains_or_contained_by(@h)).must_equal "(h && h)"
+  end
+
+  it "should define methods for all of the PostgreSQL inet functions" do
+    @ds.literal(@h.abbrev).must_equal "abbrev(h)"
+    @ds.literal(@h.broadcast).must_equal "broadcast(h)"
+    @ds.literal(@h.family).must_equal "family(h)"
+    @ds.literal(@h.host).must_equal "host(h)"
+    @ds.literal(@h.hostmask).must_equal "hostmask(h)"
+    @ds.literal(@h.masklen).must_equal "masklen(h)"
+    @ds.literal(@h.netmask).must_equal "netmask(h)"
+    @ds.literal(@h.network).must_equal "network(h)"
+    @ds.literal(@h.set_masklen(16)).must_equal "set_masklen(h, 16)"
+    @ds.literal(@h.text).must_equal "text(h)"
+  end
+
+  it "should have operators that return booleans return boolean expressions" do
+    @ds.literal((@h << @h) & :b).must_equal "((h << h) AND b)"
+    @ds.literal((@h >> @h) & :b).must_equal "((h >> h) AND b)"
+
+    @ds.literal(@h.contained_by(@h) & :b).must_equal "((h << h) AND b)"
+    @ds.literal(@h.contained_by_or_equals(@h) & :b).must_equal "((h <<= h) AND b)"
+    @ds.literal(@h.contains(@h) & :b).must_equal "((h >> h) AND b)"
+    @ds.literal(@h.contains_or_equals(@h) & :b).must_equal "((h >>= h) AND b)"
+    @ds.literal(@h.contains_or_contained_by(@h) & :b).must_equal "((h && h) AND b)"
+  end
+
+  it "should have operators that return inet return InetOp" do
+    @ds.literal((@h & @h).contains(:b)).must_equal "((h & h) >> b)"
+    @ds.literal((@h | @h).contains(:b)).must_equal "((h | h) >> b)"
+    @ds.literal((@h + @h).contains(:b)).must_equal "((h + h) >> b)"
+    @ds.literal((@h - 3).contains(:b)).must_equal "((h - 3) >> b)"
+    @ds.literal((~@h).contains(:b)).must_equal "(~h >> b)"
+  end
+
+  it "should have - operator with inet op return numeric expression" do
+    @ds.literal((@h - @h) / :b).must_equal "((h - h) / b)"
+  end
+
+  it "should have function methods returning int return numeric expressions" do
+    @ds.literal(@h.family / 2).must_equal "(family(h) / 2)"
+    @ds.literal(@h.masklen / 2).must_equal "(masklen(h) / 2)"
+  end
+
+  it "should have function methods returning text return string expressions" do
+    @ds.literal(@h.abbrev + :a).must_equal "(abbrev(h) || a)"
+    @ds.literal(@h.host + :a).must_equal "(host(h) || a)"
+    @ds.literal(@h.text + :a).must_equal "(text(h) || a)"
+  end
+
+  it "should have function methods returning inet return InetOp" do
+    @ds.literal(@h.broadcast.contains(:a)).must_equal "(broadcast(h) >> a)"
+    @ds.literal(@h.hostmask.contains(:a)).must_equal "(hostmask(h) >> a)"
+    @ds.literal(@h.netmask.contains(:a)).must_equal "(netmask(h) >> a)"
+    @ds.literal(@h.network.contains(:a)).must_equal "(network(h) >> a)"
+    @ds.literal(@h.set_masklen(16).contains(:a)).must_equal "(set_masklen(h, 16) >> a)"
+  end
+
+  it "should string and IPAddr instances in a cast to inet" do
+    @ds.literal(Sequel.pg_inet_op('1.2.3.4').contains(:a)).must_equal "(CAST('1.2.3.4' AS inet) >> a)"
+    @ds.literal(Sequel.pg_inet_op(IPAddr.new('1.2.3.4')).contains(:a)).must_equal "(CAST('1.2.3.4/32' AS inet) >> a)"
+  end
+end

data/spec/extensions/spec_helper.rb

@@ -1,5 +1,10 @@
 require 'rubygems'
 
+gem 'minitest'
+require 'minitest/autorun'
+require 'minitest/hooks/default'
+require 'minitest/shared_description'
+
 if ENV['COVERAGE']
   require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")
   SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/(extensions|plugins)/\w+\.rb\z})
@@ -29,11 +34,6 @@ def skip_warn(s)
   warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
 end
 
-gem 'minitest'
-require 'minitest/autorun'
-require 'minitest/hooks/default'
-require 'minitest/shared_description'
-
 Sequel.quote_identifiers = false
 Sequel.identifier_input_method = nil
 Sequel.identifier_output_method = nil

data/spec/extensions/update_refresh_spec.rb

@@ -27,6 +27,18 @@ describe "Sequel::Plugins::UpdateRefresh" do
     o.name.must_equal 'b'
   end
 
+  it "should support specifying columns to return" do
+    @db.extend_datasets{def supports_returning?(x) true end; def update_sql(*); sql = super; update_returning_sql(sql); sql end}
+    @c.plugin :update_refresh, :columns => [ :a ]
+    @c.dataset = @db[:test]
+    @db.sqls
+    o = @c.load(:id=>1, :name=>'a')
+    o.save
+    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1) RETURNING a"]
+    o.name.must_equal 'b'
+  end
+
+
   it "should refresh the instance after updating when returning specific columns" do
     @db.extend_datasets{def supports_returning?(x) true end; def update_sql(*); sql = super; update_returning_sql(sql); sql end}
     @c.plugin :insert_returning_select

data/spec/extensions/validation_helpers_spec.rb

@@ -56,6 +56,13 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.must_be :valid?
   end
   
+  it "should take a :from=>:values option to lookup in values hash" do
+    @c.set_validations{validates_max_length(50, :value, :from=>:values)}
+    @c.send(:define_method, :value){super() * 2}
+    @m.value = ' ' * 26
+    @m.must_be :valid?
+  end
+  
   it "should allow a proc for the :message option" do
     @c.set_validations{validates_format(/.+_.+/, :value, :message=>proc{|f| "doesn't match #{f.inspect}"})}
     @m.value = 'abc_'

data/spec/integration/plugin_test.rb

@@ -33,21 +33,27 @@ describe "Class Table Inheritance Plugin" do
     end 
     class ::Executive < Manager
     end 
+    class ::Ceo < Executive
+    end 
     class ::Staff < Employee
       many_to_one :manager
     end 
     
-    @i1 =@db[:employees].insert(:name=>'E', :kind=>'Employee')
+    
+    @i1 = @db[:employees].insert(:name=>'E', :kind=>'Employee')
     @i2 = @db[:employees].insert(:name=>'S', :kind=>'Staff')
     @i3 = @db[:employees].insert(:name=>'M', :kind=>'Manager')
-    @i4 = @db[:employees].insert(:name=>'Ex', :kind=>'Executive')
     @db[:managers].insert(:id=>@i3, :num_staff=>7)
+    @i4 = @db[:employees].insert(:name=>'Ex', :kind=>'Executive')
     @db[:managers].insert(:id=>@i4, :num_staff=>5)
     @db[:executives].insert(:id=>@i4, :num_managers=>6)
+    @i5 = @db[:employees].insert(:name=>'C', :kind=>'Ceo')
+    @db[:managers].insert(:id=>@i5, :num_staff=>2)
+    @db[:executives].insert(:id=>@i5, :num_managers=>1)
     @db[:staff].insert(:id=>@i2, :manager_id=>@i4)
   end
   after do
-    [:Executive, :Manager, :Staff, :Employee].each{|s| Object.send(:remove_const, s)}
+    [:Ceo, :Executive, :Manager, :Staff, :Employee].each{|s| Object.send(:remove_const, s)}
   end
   after(:all) do
     @db.drop_table? :staff, :executives, :managers, :employees
@@ -58,7 +64,8 @@ describe "Class Table Inheritance Plugin" do
       Employee.load(:id=>@i1, :name=>'E', :kind=>'Employee'),
       Staff.load(:id=>@i2, :name=>'S', :kind=>'Staff'),
       Manager.load(:id=>@i3, :name=>'M', :kind=>'Manager'),
-      Executive.load(:id=>@i4, :name=>'Ex', :kind=>'Executive')
+      Executive.load(:id=>@i4, :name=>'Ex', :kind=>'Executive'),
+      Ceo.load(:id=>@i5, :name=>'C', :kind=>'Ceo')
     ]
   end
   
@@ -71,6 +78,8 @@ describe "Class Table Inheritance Plugin" do
     Employee[@i4].num_staff.must_equal 5
     Employee[@i4][:num_managers].must_equal nil
     Employee[@i4].num_managers.must_equal 6
+    Employee[@i5][:num_managers].must_equal nil
+    Employee[@i5].num_managers.must_equal 1
   end
   
   it "should eagerly load columns in subclass tables when retrieving multiple objects" do
@@ -83,6 +92,8 @@ describe "Class Table Inheritance Plugin" do
     a[3].num_staff.must_equal 5
     a[3][:num_managers].must_equal nil
     a[3].num_managers.must_equal 6
+    a[4][:num_managers].must_equal 1
+    a[4].num_managers.must_equal 1
   end
   
   it "should include schema for columns for tables for ancestor classes" do
@@ -90,6 +101,7 @@ describe "Class Table Inheritance Plugin" do
     Staff.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :manager_id, :name]
     Manager.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name, :num_staff]
     Executive.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name, :num_managers, :num_staff]
+    Ceo.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name, :num_managers, :num_staff]
   end
   
   it "should include columns for tables for ancestor classes" do
@@ -97,10 +109,11 @@ describe "Class Table Inheritance Plugin" do
     Staff.columns.must_equal [:id, :name, :kind, :manager_id]
     Manager.columns.must_equal [:id, :name, :kind, :num_staff]
     Executive.columns.must_equal [:id, :name, :kind, :num_staff, :num_managers]
+    Ceo.columns.must_equal [:id, :name, :kind, :num_staff, :num_managers]
   end
   
   it "should delete rows from all tables" do
-    e = Executive.first
+    e = Ceo.first
     i = e.id
     e.staff_members_dataset.destroy
     e.destroy
@@ -114,9 +127,9 @@ describe "Class Table Inheritance Plugin" do
   end
 
   it "should insert rows into all tables" do
-    e = Executive.create(:name=>'Ex2', :num_managers=>8, :num_staff=>9)
+    e = Ceo.create(:name=>'Ex2', :num_managers=>8, :num_staff=>9)
     i = e.id
-    @db[:employees][:id=>i].must_equal(:id=>i, :name=>'Ex2', :kind=>'Executive')
+    @db[:employees][:id=>i].must_equal(:id=>i, :name=>'Ex2', :kind=>'Ceo')
     @db[:managers][:id=>i].must_equal(:id=>i, :num_staff=>9)
     @db[:executives][:id=>i].must_equal(:id=>i, :num_managers=>8)
   end
@@ -1280,20 +1293,42 @@ describe "AssociationPks plugin" do
     Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [@h2], []]
   end
 
+  it "should handle :delay association option for new instances" do
+    album_class = Class.new(Album)
+    album_class.many_to_many :tags, :clone=>:tags, :delay_pks=>true, :join_table=>:albums_tags, :left_key=>:album_id
+    album = album_class.new(:name=>'test album')
+    album.tag_pks.must_equal []
+    album.tag_pks = [@t1, @t2]
+    album.tag_pks.must_equal [@t1, @t2]
+    album.save
+    album_class.with_pk!(album.pk).tag_pks.sort.must_equal [@t1, @t2]
+  end
+
+  it "should handle :delay=>:all association option for existing instances" do
+    album_class = Class.new(Album)
+    album_class.many_to_many :tags, :clone=>:tags, :delay_pks=>:always, :join_table=>:albums_tags, :left_key=>:album_id
+    album = album_class.with_pk!(@al1)
+    album.tag_pks.sort.must_equal [@t1, @t2, @t3]
+    album.tag_pks = [@t1, @t2]
+    album.tag_pks.must_equal [@t1, @t2]
+    album.save_changes
+    album_class.with_pk!(album.pk).tag_pks.sort.must_equal [@t1, @t2]
+  end
+
   it "should set associated pks correctly for a one_to_many association" do
     Artist.use_transactions = true
     Album.order(:id).select_map(:artist_id).must_equal [@ar1, @ar1, @ar1]
 
-    Artist[@ar2].album_pks = [@t1, @t3]
-    Artist[@ar1].album_pks.must_equal [@t2]
+    Artist[@ar2].album_pks = [@al1, @al3]
+    Artist[@ar1].album_pks.must_equal [@al2]
     Album.order(:id).select_map(:artist_id).must_equal [@ar2, @ar1, @ar2]
 
-    Artist[@ar1].album_pks = [@t1]
-    Artist[@ar2].album_pks.must_equal [@t3]
+    Artist[@ar1].album_pks = [@al1]
+    Artist[@ar2].album_pks.must_equal [@al3]
     Album.order(:id).select_map(:artist_id).must_equal [@ar1, nil, @ar2]
 
-    Artist[@ar1].album_pks = [@t1, @t2]
-    Artist[@ar2].album_pks.must_equal [@t3]
+    Artist[@ar1].album_pks = [@al1, @al2]
+    Artist[@ar2].album_pks.must_equal [@al3]
     Album.order(:id).select_map(:artist_id).must_equal [@ar1, @ar1, @ar2]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.23.0
+  version: 4.24.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -224,6 +224,7 @@ extra_rdoc_files:
 - doc/release_notes/4.21.0.txt
 - doc/release_notes/4.22.0.txt
 - doc/release_notes/4.23.0.txt
+- doc/release_notes/4.24.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -335,6 +336,7 @@ files:
 - doc/release_notes/4.21.0.txt
 - doc/release_notes/4.22.0.txt
 - doc/release_notes/4.23.0.txt
+- doc/release_notes/4.24.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
 - doc/release_notes/4.5.0.txt
@@ -357,8 +359,6 @@ files:
 - lib/sequel/adapters/ado/mssql.rb
 - lib/sequel/adapters/amalgalite.rb
 - lib/sequel/adapters/cubrid.rb
-- lib/sequel/adapters/db2.rb
-- lib/sequel/adapters/dbi.rb
 - lib/sequel/adapters/do.rb
 - lib/sequel/adapters/do/mysql.rb
 - lib/sequel/adapters/do/postgres.rb
@@ -483,6 +483,7 @@ files:
 - lib/sequel/extensions/pg_hstore.rb
 - lib/sequel/extensions/pg_hstore_ops.rb
 - lib/sequel/extensions/pg_inet.rb
+- lib/sequel/extensions/pg_inet_ops.rb
 - lib/sequel/extensions/pg_interval.rb
 - lib/sequel/extensions/pg_json.rb
 - lib/sequel/extensions/pg_json_ops.rb
@@ -681,6 +682,7 @@ files:
 - spec/extensions/pg_enum_spec.rb
 - spec/extensions/pg_hstore_ops_spec.rb
 - spec/extensions/pg_hstore_spec.rb
+- spec/extensions/pg_inet_ops_spec.rb
 - spec/extensions/pg_inet_spec.rb
 - spec/extensions/pg_interval_spec.rb
 - spec/extensions/pg_json_ops_spec.rb

data/lib/sequel/adapters/db2.rb

@@ -1,229 +0,0 @@
-require 'db2/db2cli'
-Sequel.require %w'shared/db2', 'adapters'
-Sequel::Deprecation.deprecate 'The db2 adapter is deprecated and will be removed in a future version of Sequel.  Please switch to the ibmdb adapter.'
-
-module Sequel
-  module DB2
-
-    @convert_smallint_to_bool = true
-
-    # Underlying error raised by Sequel, since ruby-db2 doesn't
-    # use exceptions.
-    class DB2Error < StandardError
-    end
-
-    class << self
-      # Whether to convert smallint values to bool, true by default.
-      # Can also be overridden per dataset.
-      attr_accessor :convert_smallint_to_bool
-    end
-
-    tt = Class.new do
-      def boolean(s) !s.to_i.zero? end
-      def date(s) Date.new(s.year, s.month, s.day) end
-      def time(s) Sequel::SQLTime.create(s.hour, s.minute, s.second) end
-    end.new
-
-    # Hash holding type translation methods, used by Dataset#fetch_rows.
-    DB2_TYPES = {
-      :boolean  => tt.method(:boolean),
-      DB2CLI::SQL_BLOB => ::Sequel::SQL::Blob.method(:new),
-      DB2CLI::SQL_TYPE_DATE => tt.method(:date),
-      DB2CLI::SQL_TYPE_TIME => tt.method(:time),
-      DB2CLI::SQL_DECIMAL => ::BigDecimal.method(:new)
-    }
-
-    class Database < Sequel::Database
-      include DatabaseMethods
-
-      set_adapter_scheme :db2
-
-      TEMPORARY = 'GLOBAL TEMPORARY '.freeze
-      _, NullHandle = DB2CLI.SQLAllocHandle(DB2CLI::SQL_HANDLE_ENV, DB2CLI::SQL_NULL_HANDLE)
-      
-      # Hash of connection procs for converting
-      attr_reader :conversion_procs
-
-      def connect(server)
-        opts = server_opts(server)
-        dbc = checked_error("Could not allocate database connection"){DB2CLI.SQLAllocHandle(DB2CLI::SQL_HANDLE_DBC, NullHandle)}
-        checked_error("Could not connect to database"){DB2CLI.SQLConnect(dbc, opts[:database], opts[:user], opts[:password])}
-        dbc
-      end
-      
-      def disconnect_connection(conn)
-        DB2CLI.SQLDisconnect(conn)
-        DB2CLI.SQLFreeHandle(DB2CLI::SQL_HANDLE_DBC, conn)
-      end
-
-      def execute(sql, opts=OPTS, &block)
-        synchronize(opts[:server]){|conn| log_connection_execute(conn, sql, &block)}
-      end
-
-      def execute_insert(sql, opts=OPTS)
-        synchronize(opts[:server]) do |conn|
-          log_connection_execute(conn, sql)
-          sql = "SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"
-          log_connection_execute(conn, sql) do |sth|
-            _, _, datatype, size, _, _ = checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, 1, 256)}
-            if DB2CLI.SQLFetch(sth) != DB2CLI::SQL_NO_DATA_FOUND
-              v, _ = checked_error("Could not get data"){DB2CLI.SQLGetData(sth, 1, datatype, size)}
-              if v.is_a?(String) 
-                return v.to_i
-              else
-                return nil
-              end
-            end
-          end
-        end
-      end
-      
-      ERROR_MAP = {}
-      %w'SQL_INVALID_HANDLE SQL_STILL_EXECUTING SQL_ERROR'.each do |s|
-        ERROR_MAP[DB2CLI.const_get(s)] = s
-      end
-      def check_error(rc, msg)
-        case rc
-        when DB2CLI::SQL_SUCCESS, DB2CLI::SQL_SUCCESS_WITH_INFO, DB2CLI::SQL_NO_DATA_FOUND
-          nil
-        when DB2CLI::SQL_INVALID_HANDLE, DB2CLI::SQL_STILL_EXECUTING
-          e = DB2Error.new("#{ERROR_MAP[rc]}: #{msg}")
-          e.set_backtrace(caller)
-          raise_error(e, :disconnect=>true)
-        else
-          e = DB2Error.new("#{ERROR_MAP[rc] || "Error code #{rc}"}: #{msg}")
-          e.set_backtrace(caller)
-          raise_error(e, :disconnect=>true)
-        end
-      end
-
-      def checked_error(msg)
-        rc, *ary= yield
-        check_error(rc, msg)
-        ary.length <= 1 ? ary.first : ary
-      end
-
-      def to_application_timestamp_db2(v)
-        to_application_timestamp(v.to_s)
-      end
-
-      private
-
-      def adapter_initialize
-        @conversion_procs = DB2_TYPES.dup
-        @conversion_procs[DB2CLI::SQL_TYPE_TIMESTAMP] = method(:to_application_timestamp_db2)
-      end
-
-      def database_error_classes
-        [DB2Error]
-      end
-
-      def begin_transaction(conn, opts=OPTS)
-        log_yield(TRANSACTION_BEGIN){DB2CLI.SQLSetConnectAttr(conn, DB2CLI::SQL_ATTR_AUTOCOMMIT, DB2CLI::SQL_AUTOCOMMIT_OFF)}
-        set_transaction_isolation(conn, opts)
-      end
-
-      def remove_transaction(conn, committed)
-        DB2CLI.SQLSetConnectAttr(conn, DB2CLI::SQL_ATTR_AUTOCOMMIT, DB2CLI::SQL_AUTOCOMMIT_ON)
-      ensure
-        super
-      end
-
-      def rollback_transaction(conn, opts=OPTS)
-        log_yield(TRANSACTION_ROLLBACK){DB2CLI.SQLEndTran(DB2CLI::SQL_HANDLE_DBC, conn, DB2CLI::SQL_ROLLBACK)}
-      end
-
-      def commit_transaction(conn, opts=OPTS)
-        log_yield(TRANSACTION_COMMIT){DB2CLI.SQLEndTran(DB2CLI::SQL_HANDLE_DBC, conn, DB2CLI::SQL_COMMIT)}
-      end
-    
-      def log_connection_execute(conn, sql)
-        sth = checked_error("Could not allocate statement"){DB2CLI.SQLAllocHandle(DB2CLI::SQL_HANDLE_STMT, conn)}
-
-        begin
-          checked_error("Could not execute statement: #{sql}"){log_yield(sql){DB2CLI.SQLExecDirect(sth, sql)}}
-          
-          if block_given?
-            yield(sth)
-          else
-            checked_error("Could not get RPC"){DB2CLI.SQLRowCount(sth)}
-          end
-        ensure
-          checked_error("Could not free statement"){DB2CLI.SQLFreeHandle(DB2CLI::SQL_HANDLE_STMT, sth)}
-        end
-      end
-
-      # Convert smallint type to boolean if convert_smallint_to_bool is true
-      def schema_column_type(db_type)
-        if DB2.convert_smallint_to_bool && db_type =~ /smallint/i 
-          :boolean
-        else
-          super
-        end
-      end
-    end
-    
-    class Dataset < Sequel::Dataset
-      include DatasetMethods
-
-      Database::DatasetClass = self
-      MAX_COL_SIZE = 256
-      
-      # Whether to convert smallint to boolean arguments for this dataset.
-      # Defaults to the DB2 module setting.
-      def convert_smallint_to_bool
-        defined?(@convert_smallint_to_bool) ? @convert_smallint_to_bool : (@convert_smallint_to_bool = DB2.convert_smallint_to_bool)
-      end
-
-      # Override the default DB2.convert_smallint_to_bool setting for this dataset.
-      attr_writer :convert_smallint_to_bool
-
-      def fetch_rows(sql)
-        execute(sql) do |sth|
-          db = @db
-          column_info = get_column_info(sth)
-          cols = column_info.map{|c| c.at(1)}
-          @columns = cols
-          errors = [DB2CLI::SQL_NO_DATA_FOUND, DB2CLI::SQL_ERROR]
-          until errors.include?(rc = DB2CLI.SQLFetch(sth))
-            db.check_error(rc, "Could not fetch row")
-            row = {}
-            column_info.each do |i, c, t, s, pr|
-              v, _ = db.checked_error("Could not get data"){DB2CLI.SQLGetData(sth, i, t, s)}
-              row[c] = if v == DB2CLI::Null
-                nil
-              elsif pr
-                pr.call(v)
-              else
-                v
-              end
-            end
-            yield row
-          end
-        end
-        self
-      end
-      
-      private
-
-      def get_column_info(sth)
-        db = @db
-        column_count = db.checked_error("Could not get number of result columns"){DB2CLI.SQLNumResultCols(sth)}
-        convert = convert_smallint_to_bool
-        cps = db.conversion_procs
-
-        (1..column_count).map do |i| 
-          name, _, datatype, size, digits, _ = db.checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, i, MAX_COL_SIZE)}
-          pr = if datatype == DB2CLI::SQL_SMALLINT && convert && size <= 5 && digits <= 1
-            cps[:boolean]
-          elsif datatype == DB2CLI::SQL_CLOB && Sequel::DB2.use_clob_as_blob
-            cps[DB2CLI::SQL_BLOB]
-          else
-            cps[datatype]
-          end
-          [i, output_identifier(name), datatype, size, pr]
-        end 
-      end
-    end
-  end
-end