odba 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16603b53ff650531c5033f59fe10a783862af1be
-  data.tar.gz: 585862c143d0afd37d098fb2909a8687649fd983
+SHA256:
+  metadata.gz: 8eeea954899332aa488838e1af1f1aff8d9b4a228efb1a83fbe7d800518d4fb7
+  data.tar.gz: 3ff0033e77a3737f63279be8f55045495268372a86c9c24a59ffbf60df46252f
 SHA512:
-  metadata.gz: ece100e608273736d4b6ad5c1652dd25a0788eb53320e85c1fcc794fe9ff0a7e63b18527147a7c4f763a14692dc6b0e5c8d440842bd39b4187d5af5521920855
-  data.tar.gz: 4aee8414f90279ae66fe63f90e37cd1ff648c01131589d71ad7c9c59be5747d9a7e801d5de03e2c9a0ddd1a281606f32e5d450d20c3ba28a860eae1524e80f41
+  metadata.gz: 6f2141814522c6e0f7e01b71cc4a826abfb5172a6abfb423d871033d804aeea63db8febecfa3252c08591af4e77bcb0efc3eabfad8f85dd88b1b2e704fa50ff3
+  data.tar.gz: 1e9a12681a46bc3fa6154350af97f7abd8bc065d1ffa4ede3af8419209139433b21e5d5b3afb844599758b015f77d1b86abbd96d1913e209f2979e198be0fd60

data/Gemfile

@@ -2,16 +2,10 @@ source "https://rubygems.org"
 
 gemspec
 
-group 'test' do
-  gem 'flexmock', "~> 1.3.0"
-  gem 'test-unit'
-  gem 'minitest'
-end
-
 group 'debugger' do
   gem 'pry'
   gem 'pry-nav'
   gem 'pry-rescue'
   gem 'pry-stack_explorer'
   gem 'pry-doc'
-end
+end

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.6 / 23.01.2016
+
+* Updated to use ydbi 0.5.6
+
 === 1.1.5 / 23.01.2016
 
 * Remove unused parameter dict for update_fulltext_index

data/lib/odba/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 class Odba
-    VERSION = '1.1.5'
+    VERSION = '1.1.6'
 end

data/odba.gemspec

@@ -16,13 +16,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'ydbi',   '>=0.5.1'
-  spec.add_dependency 'ydbd-pg','>=0.5.1'
+  spec.add_dependency 'ydbi',   '>=0.5.6'
+  spec.add_dependency 'ydbd-pg','>=0.5.6'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "debug_inspector"
   spec.add_development_dependency "simplecov", '>= 0.14.1'
-  spec.add_development_dependency "minitest" if /^1\./.match(RUBY_VERSION)
 end
-

data/test/test_array.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'

data/test/test_cache.rb

@@ -6,6 +6,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/cache'
 require 'odba/cache_entry'

data/test/test_cache_entry.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/cache_entry'
 require 'odba/odba'

data/test/test_connection_pool.rb

@@ -4,6 +4,7 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/connection_pool'
 ## connection_pool requires 'dbi', which unshifts the site_ruby dir

data/test/test_drbwrapper.rb

@@ -4,8 +4,9 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
-require 'odba/drbwrapper'
+require 'flexmock/test_unit'
 require 'flexmock'
+require 'odba/drbwrapper'
 
 module ODBA
   class TestDRbWrapper < Minitest::Test

data/test/test_hash.rb

@@ -4,11 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
+require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'
 require 'odba/odba'
-require 'minitest/autorun'
-require 'flexmock'
 
 module ODBA
 	class TestHash < Minitest::Test

data/test/test_id_server.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
 require 'odba/id_server'
 require 'odba/odba'

data/test/test_index.rb

@@ -5,10 +5,11 @@ $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/index'
 require 'odba/index_definition'
 require 'odba/odba'
-require 'flexmock'
 
 module ODBA
   class Origin
@@ -310,7 +311,6 @@ module ODBA
       ODBA.storage = @storage
       df = IndexDefinition.new
       df.index_name = 'index'
-      df.dictionary = 'german'
       df.origin_klass = :Origin
       df.target_klass = :Target
       df.resolve_origin = :origin
@@ -320,12 +320,12 @@ module ODBA
     def test_fetch_ids
       rows = [[1,3], [2,2], [3,1]]
       @storage.should_receive(:retrieve_from_fulltext_index)\
-        .with('index', 'search-term', 'german', false).and_return rows
+        .with('index', 'search-term', false).and_return rows
       assert_equal([1,2,3], @index.fetch_ids('search-term'))
     end
     def test_do_update_index
       @storage.should_receive(:update_fulltext_index)\
-        .with('index', 3, 'some full text', 4, 'german')
+        .with('index', 3, 'some full text', 4)
       @index.do_update_index(3, 'some full text', 4)
     end
     def test_update_target
@@ -334,9 +334,9 @@ module ODBA
       @storage.should_receive(:fulltext_index_delete)\
         .with('index', 4, 'target_id')
       @storage.should_receive(:update_fulltext_index)\
-        .with('index', 1, 'fulltext term', 4, 'german')
+        .with('index', 1, 'fulltext term', 4)
       @storage.should_receive(:update_fulltext_index)\
-        .with('index', 2, 'fulltext term', 4, 'german')
+        .with('index', 2, 'fulltext term', 4)
       target = Target.new
       target.odba_id = 4
       origin1 = Origin.new
@@ -356,9 +356,9 @@ module ODBA
       @storage.should_receive(:fulltext_index_delete)\
         .times(1).with('index', 1, 'origin_id')
       @storage.should_receive(:update_fulltext_index)\
-        .times(1).with('index', 1, 'fulltext term', 4, 'german')
+        .times(1).with('index', 1, 'fulltext term', 4)
       @storage.should_receive(:update_fulltext_index)\
-        .times(1).with('index', 1, 'fulltext term', 5, 'german')
+        .times(1).with('index', 1, 'fulltext term', 5)
       target = Target.new
       target.odba_id = 4
       origin1 = Origin.new

data/test/test_marshal.rb

@@ -3,6 +3,8 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/marshal'
 
 module ODBA

data/test/test_persistable.rb

@@ -4,14 +4,15 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
+require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/persistable'
 require 'odba/stub'
 require 'odba/cache'
 require 'odba/odba'
 require 'odba/storage'
 require 'odba/marshal'
-require 'minitest/autorun'
-require 'flexmock'
 require 'yaml'
 
 module ODBA

data/test/test_storage.rb

@@ -5,9 +5,10 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 
-require 'odba/storage'
 require 'minitest/autorun'
+require 'flexmock/test_unit'
 require 'flexmock'
+require 'odba/storage'
 
 module ODBA
 	class Storage
@@ -40,25 +41,25 @@ module ODBA
 			expected1 = <<-SQL
 				DELETE FROM object_connection WHERE origin_id = ?
 			SQL
-			dbi.should_receive(:do).with(expected1, 2).times(1).and_return do
+			dbi.should_receive(:do).once.with(expected1, 2).times(1).and_return do
         assert true
       end
 			expected2 = <<-SQL
 				DELETE FROM object_connection WHERE target_id = ?
 			SQL
-			dbi.should_receive(:do).with(expected2, 2).times(1).and_return do
+			dbi.should_receive(:do).once.with(expected2, 2).times(1).and_return do
         assert true
       end
 			expected3 = <<-SQL
 				DELETE FROM collection WHERE odba_id = ?
 			SQL
-			dbi.should_receive(:do).with(expected3, 2).times(1).and_return do
+			dbi.should_receive(:do).once.with(expected3, 2).times(1).and_return do
         assert true
       end
 			expected4 = <<-SQL
 				DELETE FROM object WHERE odba_id = ?
 			SQL
-			dbi.should_receive(:do).with(expected4, 2).times(1).and_return do
+			dbi.should_receive(:do).once.with(expected4, 2).times(1).and_return do
         assert true
       end
 			@storage.delete_persistable(2)
@@ -83,36 +84,25 @@ module ODBA
 			dbi = flexmock('dbi')
 			@storage.dbi = dbi
       sql = <<-SQL
-        CREATE TABLE index_name (
-          origin_id INTEGER,
-          search_term TEXT,
-          target_id INTEGER
-        );
-      SQL
-      dbi.should_receive(:do).times(1).with(sql).and_return do
-        assert true
-      end
-      sql = <<-SQL
-        CREATE INDEX origin_id_index_name
+        CREATE INDEX IF NOT EXISTS origin_id_index_name
         ON index_name(origin_id)
       SQL
       dbi.should_receive(:do).times(1).with(sql).and_return do
         assert true
       end
       sql = <<-SQL
-        CREATE INDEX search_term_index_name
+        CREATE INDEX IF NOT EXISTS search_term_index_name
         ON index_name(search_term)
       SQL
       dbi.should_receive(:do).times(1).with(sql).and_return do
         assert true
       end
-      sql = <<-SQL
-        CREATE INDEX target_id_index_name
-        ON index_name(target_id)
-      SQL
-      dbi.should_receive(:do).times(1).with(sql).and_return do
-        assert true
-      end
+      sql = "        DROP TABLE IF EXISTS index_name;\n"
+      dbi.should_receive(:do).once.with(sql)
+      sql = "        CREATE INDEX IF NOT EXISTS target_id_index_name\n        ON index_name(target_id)\n"
+      dbi.should_receive(:do).once.with(sql)
+      sql = "        CREATE TABLE IF NOT EXISTS index_name (\n          origin_id INTEGER,\n          search_term TEXT,\n          target_id INTEGER\n        )  WITH OIDS;\n"
+      dbi.should_receive(:do).once.with(sql)
 			@storage.create_index("index_name")
 		end
 		def test_next_id
@@ -295,7 +285,7 @@ module ODBA
           WHERE origin_id=?
       SQL
       handle = flexmock('StatementHandle')
-      @dbi.should_receive(:do).with(sql, 'term', 2).times(1).and_return do
+      @dbi.should_receive(:do).once.with(sql, 'term', 2).times(1).and_return do
         assert true
       end
       @storage.update_index("index", 2, "term", nil)
@@ -334,7 +324,7 @@ module ODBA
         AND search_term = ?
         AND target_id = ?
       SQL
-			dbi.should_receive(:do).with(sql, 6, 'search-term', 5).times(1).and_return do
+			dbi.should_receive(:do).once.with(sql, 6, 'search-term', 5).times(1).and_return do
         assert true
       end
 			@storage.index_delete_target("foo_index", 6, 'search-term', 5)
@@ -342,8 +332,8 @@ module ODBA
 		def test_drop_index
 			dbi = flexmock("dbi")
 			@storage.dbi = dbi
-      sql = "DROP TABLE foo_index"
-			dbi.should_receive(:do).with(sql).and_return do
+      sql = "DROP TABLE IF EXISTS foo_index"
+			dbi.should_receive(:do).once.with(sql).and_return do
         assert true
       end
 			@storage.drop_index("foo_index")
@@ -393,7 +383,7 @@ module ODBA
               DELETE FROM object_connection
               WHERE origin_id = ? AND target_id IN (7,9)
       SQL
-      dbi.should_receive(:do).with(sql, 123).and_return {
+      dbi.should_receive(:do).once.with(sql, 123).and_return {
         assert(true)
       }
       sql = <<-SQL
@@ -428,73 +418,53 @@ module ODBA
         [:bar, 'Date'],
       ]
       sql = <<-'SQL'
-CREATE TABLE conditions (
+CREATE TABLE IF NOT EXISTS conditions (
   origin_id INTEGER,
   foo Integer,
   bar Date,
   target_id INTEGER
 );
       SQL
-      @dbi.should_receive(:do).with(sql).and_return do
+      @dbi.should_receive(:do).once.with(sql).and_return do
         assert true
       end
       sql = <<-'SQL'
-CREATE INDEX origin_id_conditions ON conditions(origin_id);
+CREATE INDEX IF NOT EXISTS origin_id_conditions ON conditions(origin_id);
       SQL
-      @dbi.should_receive(:do).with(sql).and_return do
+      @dbi.should_receive(:do).once.with(sql).and_return do
         assert true
       end
       sql = <<-'SQL'
-CREATE INDEX foo_conditions ON conditions(foo);
+CREATE INDEX IF NOT EXISTS foo_conditions ON conditions(foo);
       SQL
-      @dbi.should_receive(:do).with(sql).and_return do
+      @dbi.should_receive(:do).once.with(sql).and_return do
         assert true
       end
       sql = <<-'SQL'
-CREATE INDEX bar_conditions ON conditions(bar);
+CREATE INDEX IF NOT EXISTS bar_conditions ON conditions(bar);
       SQL
-      @dbi.should_receive(:do).with(sql).and_return do
+      @dbi.should_receive(:do).once.with(sql).and_return do
         assert true
       end
       sql = <<-'SQL'
-CREATE INDEX target_id_conditions ON conditions(target_id);
+CREATE INDEX IF NOT EXISTS target_id_conditions ON conditions(target_id);
       SQL
-      @dbi.should_receive(:do).with(sql).and_return do
+      @dbi.should_receive(:do).once.with(sql).and_return do
         assert true
       end
       @storage.create_condition_index('conditions', definition)
     end
     def test_create_fulltext_index
-      sql = <<-'SQL'
-CREATE TABLE fulltext (
-  origin_id INTEGER,
-  search_term tsvector,
-  target_id INTEGER
-);
-      SQL
       statement = flexmock('StatementHandle')
-      @dbi.should_receive(:do).with(sql).and_return do
-        assert true
-      end
-      sql = <<-'SQL'
-CREATE INDEX origin_id_fulltext ON fulltext(origin_id);
-      SQL
-      @dbi.should_receive(:do).with(sql).and_return do
-        assert true
-      end
-      sql = <<-'SQL'
-CREATE INDEX search_term_fulltext
-ON fulltext USING gist(search_term);
-      SQL
-      @dbi.should_receive(:do).with(sql).and_return do
-        assert true
-      end
-      sql = <<-'SQL'
-CREATE INDEX target_id_fulltext ON fulltext(target_id);
-      SQL
-      @dbi.should_receive(:do).with(sql).and_return do
-        assert true
-      end
+      @dbi.should_receive(:do).once.with("DROP TABLE IF EXISTS fulltext;\n")
+      sql = "CREATE INDEX IF NOT EXISTS origin_id_fulltext ON fulltext(origin_id);\n"
+      @dbi.should_receive(:do).once.with(sql).and_return
+      sql = "CREATE INDEX IF NOT EXISTS target_id_fulltext ON fulltext(target_id);\n"
+      @dbi.should_receive(:do).once.with(sql).and_return
+      sql = "CREATE TABLE IF NOT EXISTS fulltext  (\n  origin_id INTEGER,\n  search_term tsvector,\n  target_id INTEGER\n) WITH OIDS ;\n"
+      @dbi.should_receive(:do).once.with(sql).and_return
+      sql = "CREATE INDEX IF NOT EXISTS search_term_fulltext\nON fulltext USING gist(search_term);\n"
+      @dbi.should_receive(:do).once.with(sql).and_return
       @storage.create_fulltext_index('fulltext')
     end
     def test_extent_ids
@@ -523,7 +493,7 @@ CREATE INDEX target_id_fulltext ON fulltext(target_id);
         WHERE odba_id = ? AND key = ?
       SQL
       statement = flexmock('StatementHandle')
-      @dbi.should_receive(:do).with(sql, 34, 'key_dump').and_return do
+      @dbi.should_receive(:do).once.with(sql, 34, 'key_dump').and_return do
         assert true
       end
       @storage.collection_remove(34, "key_dump")
@@ -534,7 +504,7 @@ CREATE INDEX target_id_fulltext ON fulltext(target_id);
         VALUES (?, ?, ?)
       SQL
       statement = flexmock('StatementHandle')
-      @dbi.should_receive(:do).with(sql, 34, 'key_dump', 'dump').and_return do
+      @dbi.should_receive(:do).once.with(sql, 34, 'key_dump', 'dump').and_return do
         assert true
       end
       @storage.collection_store(34, "key_dump", 'dump')
@@ -606,13 +576,13 @@ CREATE INDEX target_id_fulltext ON fulltext(target_id);
       tables = %w{object_connection collection}
       @dbi.should_receive(:tables).and_return(tables)
       sql = <<-'SQL'
-CREATE TABLE object (
+CREATE TABLE IF NOT EXISTS object (
   odba_id INTEGER NOT NULL, content TEXT,
   name TEXT, prefetchable BOOLEAN, extent TEXT,
   PRIMARY KEY(odba_id), UNIQUE(name)
 );
-CREATE INDEX prefetchable_index ON object(prefetchable);
-CREATE INDEX extent_index ON object(extent);
+CREATE INDEX IF NOT EXISTS prefetchable_index ON object(prefetchable);
+CREATE INDEX IF NOT EXISTS extent_index ON object(extent);
       SQL
       @dbi.should_receive(:execute).with(sql).and_return {
         assert(true) }
@@ -625,11 +595,11 @@ CREATE INDEX extent_index ON object(extent);
       tables = %w{object collection}
       @dbi.should_receive(:tables).and_return(tables)
       sql = <<-'SQL'
-CREATE TABLE object_connection (
+CREATE TABLE IF NOT EXISTS object_connection (
   origin_id integer, target_id integer,
   PRIMARY KEY(origin_id, target_id)
 );
-CREATE INDEX target_id_index ON object_connection(target_id);
+CREATE INDEX IF NOT EXISTS target_id_index ON object_connection(target_id);
       SQL
       @dbi.should_receive(:execute).with(sql).and_return {
         assert(true) }
@@ -642,7 +612,7 @@ CREATE INDEX target_id_index ON object_connection(target_id);
       tables = %w{object object_connection}
       @dbi.should_receive(:tables).and_return(tables)
       sql = <<-'SQL'
-CREATE TABLE collection (
+CREATE TABLE IF NOT EXISTS collection (
   odba_id integer NOT NULL, key text, value text,
   PRIMARY KEY(odba_id, key)
 );
@@ -657,24 +627,13 @@ CREATE TABLE collection (
     def test_setup__extent
       tables = %w{object object_connection collection}
       @dbi.should_receive(:tables).and_return(tables)
-      sql = "CREATE TABLE object (\n  odba_id INTEGER NOT NULL, content TEXT,\n  name TEXT, prefetchable BOOLEAN, extent TEXT,\n  PRIMARY KEY(odba_id), UNIQUE(name)\n);\n"
-      @dbi.should_receive(:do).with(sql).and_return(true)
-      sql  = "CREATE INDEX prefetchable_index ON object(prefetchable);\n"
-      @dbi.should_receive(:do).with(sql).and_return(true)
-      sql = "CREATE INDEX extent_index ON object(extent);\n"
-      @dbi.should_receive(:do).with(sql).and_return(true)
-      sql = "CREATE TABLE object_connection (\n  origin_id integer, target_id integer,\n  PRIMARY KEY(origin_id, target_id)\n);\n"
-      @dbi.should_receive(:do).with(sql).and_return(true)
-      sql = "CREATE INDEX target_id_index ON object_connection(target_id);\n"
-      @dbi.should_receive(:do).with(sql).and_return(true)
-      sql = "CREATE TABLE collection (\n  odba_id integer NOT NULL, key text, value text,\n  PRIMARY KEY(odba_id, key)\n);\n"
-      @dbi.should_receive(:do).with(sql).and_return(true)
-      sql = <<-'SQL'
-ALTER TABLE object ADD COLUMN extent TEXT;
-CREATE INDEX extent_index ON object(extent);
-      SQL
-      @dbi.should_receive(:do).with(sql).and_return {
-        assert(true) }
+      sql = "CREATE TABLE IF NOT EXISTS object_connection (\n  origin_id integer, target_id integer,\n  PRIMARY KEY(origin_id, target_id)\n);\n"
+      @dbi.should_receive(:do).once.with(sql).and_return(true)
+      sql = "CREATE INDEX IF NOT EXISTS target_id_index ON object_connection(target_id);\n"
+      @dbi.should_receive(:do).once.with(sql).and_return(true)
+      sql = "CREATE TABLE IF NOT EXISTS collection (\n  odba_id integer NOT NULL, key text, value text,\n  PRIMARY KEY(odba_id, key)\n);\n"
+      @dbi.should_receive(:do).once.with(sql).and_return(true)
+      @dbi.should_receive(:do).once.with("ALTER TABLE object ADD COLUMN extent TEXT;\nCREATE INDEX IF NOT EXISTS extent_index ON object(extent);\n")
       @dbi.should_receive(:columns).and_return([])
       @storage.setup
     end
@@ -684,7 +643,7 @@ CREATE INDEX extent_index ON object(extent);
 INSERT INTO index (origin_id, target_id, foo, bar)
 VALUES (?, ?, ?, ?)
       SQL
-      @dbi.should_receive(:do).with(sql, 12, 15, 14, 'blur').times(1).and_return {
+      @dbi.should_receive(:do).once.with(sql, 12, 15, 14, 'blur').times(1).and_return {
         assert(true)
       }
       terms = [
@@ -699,7 +658,7 @@ VALUES (?, ?, ?, ?)
 UPDATE index SET foo=?, bar=?
 WHERE origin_id = ?
       SQL
-      @dbi.should_receive(:do).with(sql, 14, 'blur', 12).times(1).and_return {
+      @dbi.should_receive(:do).once.with(sql, 14, 'blur', 12).times(1).and_return {
         assert(true)
       }
       terms = [
@@ -710,29 +669,17 @@ WHERE origin_id = ?
     end
     def test_update_fulltext_index__with_target_id
       handle = flexmock('StatementHandle')
-      sql = <<-'SQL'
-INSERT INTO index (origin_id, search_term, target_id)
-VALUES (?, to_tsvector(?, ?), ?)
-      SQL
-      @dbi.should_receive(:do).with(sql, 12, "german", "some text", 
-                                    15).and_return {
-        assert(true)
-      }
-      @storage.update_fulltext_index('index', 12, "some  text", 15, 
-                                     'german')
+      sql = "INSERT INTO index (origin_id, search_term, target_id)\nVALUES (?, to_tsvector(?), ?)\n"
+      @dbi.should_receive(:do).once.with(sql, "12", "some text", 15)
+      @storage.update_fulltext_index('index', 12, "some  text", 15)
     end
     def test_update_fulltext_index__without_target_id
       handle = flexmock('StatementHandle')
-      sql = <<-'SQL'
-UPDATE index SET search_term=to_tsvector(?, ?)
-WHERE origin_id=?
-      SQL
-      @dbi.should_receive(:do).with(sql, "german", "some text", 
-                                    12).and_return {
+      sql = "UPDATE index SET search_term=to_tsvector(?)\nWHERE origin_id=?\n"
+      @dbi.should_receive(:do).once.with(sql, "some text", 12).and_return {
         assert(true)
       }
-      @storage.update_fulltext_index('index', 12, "some  text", nil,
-                                     'german')
+      @storage.update_fulltext_index('index', 12, "some  text", nil)
     end
     def test_condition_index_delete
       sql = <<-SQL
@@ -740,10 +687,10 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
       SQL
       if /^1\.8/.match(RUBY_VERSION)
         sql = "DELETE FROM index WHERE origin_id = ? AND c2 = ? AND c1 = ?"
-        @dbi.should_receive(:do).with(sql.chomp, 3, 7, 'f').times(1).and_return(true)
+        @dbi.should_receive(:do).once.with(sql.chomp, 3, 7, 'f').times(1).and_return(true)
       else
         sql = "DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?"
-        @dbi.should_receive(:do).with(sql.chomp, 3, 'f', 7).times(1).and_return(true)
+        @dbi.should_receive(:do).once.with(sql.chomp, 3, 'f', 7).times(1).and_return(true)
       end
       handle = flexmock('DBHandle')
       @storage.condition_index_delete('index', 3, {'c1' => 'f','c2' => 7})
@@ -752,10 +699,10 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
       handle = flexmock('DBHandle')
       if /^1\.8/.match(RUBY_VERSION)
         sql = "DELETE FROM index WHERE origin_id = ? AND c2 = ? AND c1 = ? AND target_id = ?"
-        @dbi.should_receive(:do).with(sql.chomp, 3, 7, 'f', 4).times(1).and_return(true)
+        @dbi.should_receive(:do).once.with(sql.chomp, 3, 7, 'f', 4).times(1).and_return(true)
       else
         sql = "DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ? AND target_id = ?"
-        @dbi.should_receive(:do).with(sql.chomp, 3, 'f', 7, 4).times(1).and_return(true)
+        @dbi.should_receive(:do).once.with(sql.chomp, 3, 'f', 7, 4).times(1).and_return(true)
       end
       @storage.condition_index_delete('index', 3, {'c1' => 'f','c2' => 7}, 4)
     end
@@ -781,7 +728,7 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
     end
     def test_ensure_target_id_index
       sql = <<-SQL
-        CREATE INDEX target_id_index
+        CREATE INDEX IF NOT EXISTS target_id_index
         ON index(target_id)
       SQL
       @dbi.should_receive(:execute).with(sql).and_return { 
@@ -793,7 +740,7 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
         DELETE FROM index
         WHERE origin_id = ?
       SQL
-      @dbi.should_receive(:do).with(sql, 4)\
+      @dbi.should_receive(:do).once.with(sql, 4)\
         .times(1).and_return { assert(true) }
       @storage.fulltext_index_delete('index', 4, 'origin_id')
     end
@@ -802,7 +749,7 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
         DELETE FROM index
         WHERE target_id = ?
       SQL
-      @dbi.should_receive(:do).with(sql, 4)\
+      @dbi.should_receive(:do).once.with(sql, 4)\
         .times(1).and_return { assert(true) }
       @storage.fulltext_index_delete('index', 4, 'target_id')
     end
@@ -828,7 +775,7 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
     end
     def test_delete_index_element__origin
       handle = flexmock('DB-Handle')
-      @dbi.should_receive(:do).with(<<-SQL, 15).times(1).and_return {
+      @dbi.should_receive(:do).once.with(<<-SQL, 15).times(1).and_return {
         DELETE FROM index WHERE origin_id = ?
       SQL
         assert(true)
@@ -837,7 +784,7 @@ DELETE FROM index WHERE origin_id = ? AND c1 = ? AND c2 = ?
     end
     def test_delete_index_element__target
       handle = flexmock('DB-Handle')
-      @dbi.should_receive(:do).with(<<-SQL, 15).times(1).and_return {
+      @dbi.should_receive(:do).once.with(<<-SQL, 15).times(1).and_return {
         DELETE FROM index WHERE target_id = ?
       SQL
         assert(true)

data/test/test_stub.rb

@@ -5,10 +5,11 @@
 $: << File.expand_path('../lib/', File.dirname(__FILE__))
 $: << File.dirname(__FILE__)
 require 'minitest/autorun'
+require 'flexmock/test_unit'
+require 'flexmock'
 require 'odba/stub'
 require 'odba/persistable'
 require 'odba/odba'
-require 'flexmock'
 require 'yaml'
 
 module ODBA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odba
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ydbi
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: ydbd-pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug_inspector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby Software for ODDB.org Memory Management