rdbi 0.9.0 → 0.9.1

data/perf/bench.rb

@@ -0,0 +1,58 @@
+require 'rubygems'
+require 'benchmark'
+require 'sequel'
+require 'rdbi'
+require 'rdbi/driver/sqlite3'
+gem 'activerecord', '= 2.3.8'
+require 'active_record'
+require 'fileutils'
+
+include FileUtils
+
+%w[rdbi-test.db sequel-test.db ar-test.db].each do |db|
+  rm db rescue nil
+
+  dbh = RDBI.connect(:SQLite3, :database => db)
+  dbh.execute("create table foo (i integer)")
+  10_000.times do |x|
+    dbh.execute("insert into foo (i) values (?i)", { :i => x })
+  end
+  dbh.disconnect
+end
+
+dbh = RDBI.connect(:SQLite3, :database => "rdbi-test.db")
+dbh.rewindable_result = false
+sql = "select * from foo limit 1"
+db = Sequel.connect('sqlite://sequel-test.db')
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "ar-test.db")
+class Foo < ActiveRecord::Base
+  set_table_name "foo"
+end
+
+puts "Single select"
+
+n = 10_000
+
+Benchmark.bm do |x|
+  x.report("AR") { n.times { Foo.find_by_sql(sql) } }
+  x.report("AR connection") { n.times { ActiveRecord::Base.connection.select_one(sql, :cache => false) } }
+  x.report("RDBI") { n.times { dbh.execute(sql).first } }
+  x.report("Sequel") { n.times { db[sql].first } }
+end
+
+puts "Big select"
+
+sql = "select * from foo"
+
+n = 50
+
+Benchmark.bm do |x|
+  x.report("AR") { n.times { Foo.find_by_sql(sql) } }
+  x.report("AR connection") { n.times { ActiveRecord::Base.connection.select_all(sql, :cache => false) } }
+  x.report("RDBI") { n.times { dbh.execute(sql).fetch(:all) } }
+  x.report("Sequel") { n.times { db[sql].all } }
+end
+
+dbh.disconnect
+db.disconnect
+# wtf does AR use to disconnect anyhow

data/perf/profile.rb

@@ -0,0 +1,123 @@
+$:.unshift 'lib'
+require 'rubygems'
+require 'rdbi'
+require 'fileutils'
+ENV["driver"] ||= "SQLite3"
+gem "rdbi-driver-#{ENV["driver"].downcase}"
+require "rdbi/driver/#{ENV["driver"].downcase}"
+gem 'perftools.rb'
+require 'perftools'
+
+FileUtils.rm 'test.db' rescue nil
+
+dbh = nil
+
+if ENV["driver"] == "SQLite3"
+  dbh = RDBI.connect(:SQLite3, :database => "test.db")
+else
+  require 'rdbi-dbrc'
+  dbh = RDBI::DBRC.connect("#{ENV["driver"]}_test")
+end
+
+dbh.execute("drop table foo") rescue nil
+dbh.execute("create table foo (i integer)")
+
+case ARGV[0]
+when "prepared_insert"
+  FileUtils.rm '/tmp/rdbi_prepared_insert' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_prepared_insert") do
+    sth = dbh.prepare("insert into foo (i) values (?)")
+    10_000.times do |x|
+      sth.execute_modification(x)
+    end
+    sth.finish
+  end
+when "insert"
+  FileUtils.rm '/tmp/rdbi_unprepared_insert' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_unprepared_insert") do
+    10_000.times do |x|
+      dbh.execute_modification("insert into foo (i) values (?)")
+    end
+  end
+when "raw_select"
+  sth = dbh.prepare("insert into foo (i) values (?)")
+  10_000.times do |x|
+    sth.execute_modification(x)
+  end
+  sth.finish
+
+  FileUtils.rm '/tmp/rdbi_raw_select' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_raw_select") do
+    sth = dbh.prepare("select * from foo")
+    100.times do |x|
+      sth.execute.raw_fetch(:all)
+    end
+    sth.finish
+  end
+when "res_select"
+  sth = dbh.prepare("insert into foo (i) values (?)")
+  10_000.times do |x|
+    sth.execute_modification(x)
+  end
+  sth.finish
+
+  FileUtils.rm '/tmp/rdbi_res_select' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_res_select") do
+    sth = dbh.prepare("select * from foo")
+    100.times do |x|
+      sth.execute.fetch(:all)
+    end
+    sth.finish
+  end
+when "single_fetch"
+  dbh.execute("insert into foo (i) values (?)", 1)
+
+  FileUtils.rm '/tmp/rdbi_single_fetch' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_single_fetch") do
+    sth = dbh.prepare("select * from foo")
+    10_000.times do |x|
+      sth.execute.fetch(1)
+    end
+    sth.finish
+  end
+when "unprepared_raw_select"
+  sth = dbh.prepare("insert into foo (i) values (?)")
+  10_000.times do |x|
+    sth.execute_modification(x)
+  end
+  sth.finish
+
+  FileUtils.rm '/tmp/rdbi_unprepared_raw_select' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_unprepared_raw_select") do
+    100.times do |x|
+      dbh.execute("select * from foo").raw_fetch(:all)
+    end
+  end
+when "unprepared_res_select"
+  sth = dbh.prepare("insert into foo (i) values (?)")
+  10_000.times do |x|
+    sth.execute_modification(x)
+  end
+  sth.finish
+
+  FileUtils.rm '/tmp/rdbi_unprepared_res_select' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_unprepared_res_select") do
+    100.times do |x|
+      dbh.execute("select * from foo").fetch(:all)
+    end
+  end
+when "unprepared_single_fetch"
+  dbh.execute("insert into foo (i) values (?)", 1)
+
+  FileUtils.rm '/tmp/rdbi_unprepared_single_fetch' rescue nil
+  PerfTools::CpuProfiler.start("/tmp/rdbi_unprepared_single_fetch") do
+    10_000.times do |x|
+      dbh.execute("select * from foo").fetch(1)
+    end
+  end
+else
+  $stderr.puts "[prepared_insert|insert|raw_select|res_select|single_fetch|unprepared_res_select|unprepared_single_fetch]"
+  exit 1
+end
+
+dbh.disconnect

data/rdbi.gemspec

@@ -1,63 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rdbi}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hollensbe"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-12-10}
   s.description = %q{RDBI is a rearchitecture of the Ruby/DBI project by its maintainer and others. It intends to fully supplant Ruby/DBI in the future for similar database access needs.}
   s.email = %q{erik@hollensbe.org}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "docs/external-api.pdf",
-     "docs/external-api.texi",
-     "lib/rdbi.rb",
-     "lib/rdbi/cursor.rb",
-     "lib/rdbi/database.rb",
-     "lib/rdbi/driver.rb",
-     "lib/rdbi/pool.rb",
-     "lib/rdbi/result.rb",
-     "lib/rdbi/schema.rb",
-     "lib/rdbi/statement.rb",
-     "lib/rdbi/types.rb",
-     "rdbi.gemspec",
-     "test/helper.rb",
-     "test/test_database.rb",
-     "test/test_pool.rb",
-     "test/test_rdbi.rb",
-     "test/test_result.rb",
-     "test/test_statement.rb",
-     "test/test_types.rb",
-     "test/test_util.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "docs/external-api.pdf",
+    "docs/external-api.texi",
+    "lib/rdbi.rb",
+    "lib/rdbi/cursor.rb",
+    "lib/rdbi/database.rb",
+    "lib/rdbi/driver.rb",
+    "lib/rdbi/pool.rb",
+    "lib/rdbi/result.rb",
+    "lib/rdbi/schema.rb",
+    "lib/rdbi/statement.rb",
+    "lib/rdbi/types.rb",
+    "perf/bench.rb",
+    "perf/profile.rb",
+    "rdbi.gemspec",
+    "test/helper.rb",
+    "test/test_database.rb",
+    "test/test_pool.rb",
+    "test/test_rdbi.rb",
+    "test/test_result.rb",
+    "test/test_statement.rb",
+    "test/test_types.rb",
+    "test/test_util.rb"
   ]
   s.homepage = %q{http://github.com/RDBI/rdbi}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{RDBI provides sane query-level database access with low magic.}
   s.test_files = [
     "test/helper.rb",
-     "test/test_database.rb",
-     "test/test_pool.rb",
-     "test/test_rdbi.rb",
-     "test/test_result.rb",
-     "test/test_statement.rb",
-     "test/test_types.rb",
-     "test/test_util.rb"
+    "test/test_database.rb",
+    "test/test_pool.rb",
+    "test/test_rdbi.rb",
+    "test/test_result.rb",
+    "test/test_statement.rb",
+    "test/test_types.rb",
+    "test/test_util.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/test_database.rb

@@ -226,11 +226,12 @@ class TestDatabase < Test::Unit::TestCase
     sth = @dbh.prepare("some statement")
     assert(sth)
 
-    assert_equal(@dbh.open_statements.length, 1)
+    assert_equal(@dbh.open_statements.keys.length, 1)
 
-    warn "The next message should appear *exactly once*"
     @dbh.disconnect
 
+    assert_equal(@dbh.open_statements.keys.length, 0)
+
     @dbh = mock_connect
     sth = @dbh.prepare("some statement")
     sth.finish

data/test/test_pool.rb

@@ -81,10 +81,16 @@ class TestPool < Test::Unit::TestCase
     end
   end
 
-  def test_06_ping
+  def test_06_ping_and_up
     pool = create_pool(:test_06)
     4.times { pool.add_connection }
     assert_equal(10, pool.ping)
+
+    assert(pool.up)
+
+    pool.handles[0].disconnect
+
+    assert(!pool.up)
   end
 
   def test_07_resize

data/test/test_rdbi.rb

@@ -63,23 +63,6 @@ class TestRDBI < Test::Unit::TestCase
     dbh = RDBI.connect_cached(:Mock, :username => :foo, :pool_name => :test_05)
     assert_equal(RDBI.pool(:test_05).handles[0], dbh)
   end
-
-  def test_06_re_disconnect_all
-    RDBI.disconnect_all
-    connected_size = RDBI.all_connections.select(&:connected).size
-    assert_equal(0, connected_size)
-
-    total_size = RDBI.all_connections.size
-    RDBI.reconnect_all
-    connected_size = RDBI.all_connections.select(&:connected).size
-    assert_equal(connected_size, total_size)
-  end
-
-  def test_07_all_connections
-    total_size = RDBI.all_connections.size
-    mock_connect
-    assert_equal(RDBI.all_connections.size, total_size + 1)
-  end
 end
 
 # vim: syntax=ruby ts=2 et sw=2 sts=2

data/test/test_result.rb

@@ -108,6 +108,8 @@ class TestResult < Test::Unit::TestCase
 
     assert_equal(generate_data[0], res.fetch(:first))
     assert_equal(generate_data[-1], res.fetch(:last))
+    assert_equal(generate_data[0], res.first)
+    assert_equal(generate_data[-1], res.last)
 
     res.sth.finish
   end
@@ -164,10 +166,8 @@ class TestResult < Test::Unit::TestCase
     # XXX reset intentionally.
     res.as(:Array)
     assert_equal([[-1, 0, 1]], res.fetch(1))
-
     res.sth.finish
-    res.rewind
-
+    
     assert_equal(
       "-1,0,1\n",
       res.fetch(1, RDBI::Result::Driver::CSV)
@@ -264,6 +264,41 @@ class TestResult < Test::Unit::TestCase
     assert_equal([], res.fetch(1))
     res.sth.finish
   end
+
+  def test_11_rewindable_results
+    @dbh.rewindable_result = true
+    res = RDBI::Result.new(@dbh.prepare("foo"), [1], RDBI::Driver::Mock::Cursor.new([]), [], 0)
+
+    res.sth.rewindable_result = false
+    assert_raises(StandardError) { res.rewind }
+    res.sth.rewindable_result = true
+    res.reload
+    res.rewind
+  end
+
+  def test_12_as_yaml
+    res = mock_result
+    require 'yaml'
+
+    assert_equal(
+      [ 
+        {:zero=>-1, :one=>0, :two=>1},
+        {:zero=>0, :one=>1, :two=>2},
+        {:zero=>1, :one=>2, :two=>3},
+        {:zero=>2, :one=>3, :two=>4},
+        {:zero=>3, :one=>4, :two=>5},
+        {:zero=>4, :one=>5, :two=>6},
+        {:zero=>5, :one=>6, :two=>7},
+        {:zero=>6, :one=>7, :two=>8},
+        {:zero=>7, :one=>8, :two=>9},
+        {:zero=>8, :one=>9, :two=>10}
+      ],
+      YAML.load(res.as(:YAML).fetch(:all))
+    )
+
+    assert_equal({:zero=>-1, :one=>0, :two=>1}, YAML.load(res.as(:YAML).first))
+    assert_equal({:zero=>8, :one=>9, :two=>10}, YAML.load(res.as(:YAML).last))
+  end
 end
 
 # vim: syntax=ruby ts=2 et sw=2 sts=2

data/test/test_statement.rb

@@ -23,7 +23,6 @@ class TestStatement < Test::Unit::TestCase
   def test_02_accessors
     sth = dbh.new_statement("some query")
     assert(sth)
-    assert_kind_of(Mutex, sth.mutex)
     assert(!sth.finished?)
     assert(!sth.finished)
     sth.finish

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdbi
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,7 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -82,7 +77,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 0
@@ -98,7 +92,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 3
@@ -114,7 +107,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -131,7 +123,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -147,6 +138,8 @@ files:
 - lib/rdbi/schema.rb
 - lib/rdbi/statement.rb
 - lib/rdbi/types.rb
+- perf/bench.rb
+- perf/profile.rb
 - rdbi.gemspec
 - test/helper.rb
 - test/test_database.rb
@@ -161,8 +154,8 @@ homepage: http://github.com/RDBI/rdbi
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -170,7 +163,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -179,7 +171,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"