odba 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60345e57c1bfc54f935b1349f9e94da3a0a4135
-  data.tar.gz: 8c7ffb139d6f7b93e99aa500357267a2c2429b26
+  metadata.gz: 2a275f0c5476fd282d1f7c67cce22d64357671f8
+  data.tar.gz: 7832d2977f9d568801af283a522ea5833ca8bf99
 SHA512:
-  metadata.gz: 71678fe42e0915eada7c995c611d01282b62564f494d9fd91bcf71b538a054a8a6f7014fffb3223447836bccfa55652994676314f216124b1b389ee5f3add161
-  data.tar.gz: 5daaf796ac79b2fc707fcb4087535e8455533cd2f7fe566d6e9deeaf74d226c47d3c087349590f2cd36bc09982dad6b159d7f8ce58854239964b1b0254de5de1
+  metadata.gz: 898f28dbabb3d7542ebeb6b7bbc3cf49934d036334da1f6042c82446189c8248a108903d0b285001b37a43ac0661c7e83d588680367378e7cc65dc3208eddefd
+  data.tar.gz: 639fa00ebbb43378e0a2ce97205d0fc367d703a85872c321ecc802061b4a63e9e6e384665d53c495209afc263f7de8fd7f63e12846d8e3f251f35377d57269ff

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.3 / 12.12.2016
+
+* Avoid errors by always specifying "IF NOT EXISTS" when creating tables and indices
+* Add utility method get_server_version
+* Removed misleaading check in generate_dictionary
+
 === 1.1.2 / 10.05.2016
 
 * requires now 'ydbi' and 'ydbd-pg'

data/lib/odba/storage.rb

@@ -15,31 +15,31 @@ module ODBA
     TABLES = [
       # in table 'object', the isolated dumps of all objects are stored
       ['object', <<-'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)
 );
       SQL
       ['prefetchable_index', <<-SQL],
-CREATE INDEX prefetchable_index ON object(prefetchable);
+CREATE INDEX IF NOT EXISTS prefetchable_index ON object(prefetchable);
       SQL
       ['extent_index', <<-SQL],
-CREATE INDEX extent_index ON object(extent);
+CREATE INDEX IF NOT EXISTS extent_index ON object(extent);
       SQL
       # helper table 'object_connection'
       ['object_connection', <<-'SQL'],
-CREATE TABLE object_connection (
+CREATE TABLE IF NOT EXISTS object_connection (
   origin_id integer, target_id integer,
   PRIMARY KEY(origin_id, target_id)
 );
       SQL
       ['target_id_index', <<-SQL],
-CREATE INDEX target_id_index ON object_connection(target_id);
+CREATE INDEX IF NOT EXISTS target_id_index ON object_connection(target_id);
       SQL
       # helper table 'collection'
       ['collection', <<-'SQL'],
-CREATE TABLE collection (
+CREATE TABLE IF NOT EXISTS collection (
   odba_id integer NOT NULL, key text, value text,
   PRIMARY KEY(odba_id, key)
 );
@@ -135,7 +135,7 @@ CREATE TABLE collection (
     end
     def create_condition_index(table_name, definition)
       self.dbi.do <<-SQL
-CREATE TABLE #{table_name} (
+CREATE TABLE IF NOT EXISTS #{table_name} (
   origin_id INTEGER,
   #{definition.collect { |*pair| pair.join(' ') }.join(",\n  ") },
   target_id INTEGER
@@ -143,22 +143,22 @@ CREATE TABLE #{table_name} (
       SQL
       #index origin_id
       self.dbi.do <<-SQL
-CREATE INDEX origin_id_#{table_name} ON #{table_name}(origin_id);
+CREATE INDEX IF NOT EXISTS origin_id_#{table_name} ON #{table_name}(origin_id);
       SQL
       #index search_term
       definition.each { |name, datatype|
         self.dbi.do <<-SQL
-CREATE INDEX #{name}_#{table_name} ON #{table_name}(#{name});
+CREATE INDEX IF NOT EXISTS #{name}_#{table_name} ON #{table_name}(#{name});
         SQL
       }
       #index target_id
       self.dbi.do <<-SQL
-CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
+CREATE INDEX IF NOT EXISTS target_id_#{table_name} ON #{table_name}(target_id);
       SQL
     end
     def create_fulltext_index(table_name)
       self.dbi.do <<-SQL
-CREATE TABLE #{table_name} (
+CREATE TABLE IF NOT EXISTS #{table_name} (
   origin_id INTEGER,
   search_term tsvector,
   target_id INTEGER
@@ -166,21 +166,20 @@ CREATE TABLE #{table_name} (
       SQL
       #index origin_id
       self.dbi.do <<-SQL
-CREATE INDEX origin_id_#{table_name} ON #{table_name}(origin_id);
+CREATE INDEX IF NOT EXISTS origin_id_#{table_name} ON #{table_name}(origin_id);
       SQL
-      #index search_term
       self.dbi.do <<-SQL
-CREATE INDEX search_term_#{table_name}
+CREATE INDEX IF NOT EXISTS search_term_#{table_name}
 ON #{table_name} USING gist(search_term);
       SQL
       #index target_id
       self.dbi.do <<-SQL
-CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
+CREATE INDEX IF NOT EXISTS target_id_#{table_name} ON #{table_name}(target_id);
       SQL
     end
     def create_index(table_name)
       self.dbi.do <<-SQL
-        CREATE TABLE #{table_name} (
+        CREATE TABLE IF NOT EXISTS #{table_name} (
           origin_id INTEGER,
           search_term TEXT,
           target_id INTEGER
@@ -188,17 +187,17 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
       SQL
       #index origin_id
       self.dbi.do <<-SQL
-        CREATE INDEX origin_id_#{table_name}
+        CREATE INDEX IF NOT EXISTS origin_id_#{table_name}
         ON #{table_name}(origin_id)
       SQL
       #index search_term
       self.dbi.do <<-SQL
-        CREATE INDEX search_term_#{table_name}
+        CREATE INDEX IF NOT EXISTS search_term_#{table_name}
         ON #{table_name}(search_term)
       SQL
       #index target_id
       self.dbi.do <<-SQL
-        CREATE INDEX target_id_#{table_name}
+        CREATE INDEX IF NOT EXISTS target_id_#{table_name}
         ON #{table_name}(target_id)
       SQL
     end
@@ -267,7 +266,7 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
     def ensure_target_id_index(table_name)
       #index target_id
       self.dbi.do <<-SQL
-        CREATE INDEX target_id_#{table_name}
+        CREATE INDEX IF NOT EXISTS target_id_#{table_name}
         ON #{table_name}(target_id)
       SQL
     rescue
@@ -288,6 +287,9 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
         WHERE #{id_name} = ?
       SQL
     end
+    def get_server_version
+      /\s([\d\.]+)\s/.match(self.dbi.select_all("select version();").first.first)[1]
+    end
     def fulltext_index_target_ids(index_name, origin_id)
       sql = <<-SQL
         SELECT DISTINCT target_id
@@ -296,17 +298,11 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
       SQL
       self.dbi.select_all(sql, origin_id)
     end
-    def generate_dictionary(language, data_path='/usr/share/postgresql/tsearch_data/', file='fulltext')
-      found = true
-      %w{dict affix stop}.each do |ext|
-        filename = "#{language}_#{file}.#{ext}"
-        source   = File.join(data_path, filename)
-        unless File.exists?(source)
-          puts "ERROR:  \"#{filename}\" does not exist in #{data_path}."
-          found = false
-        end
-      end
-      return unless found
+    def generate_dictionary(language)
+      # postgres searches for the dictionary file in the directory share/tsearch_data of it installation location
+      # By default under gentoo, this is /usr/share/postgresql/tsearch_data/
+      # As we have no way to get the current installation path, we do not check whether the files are present or not
+      file='fulltext'
       # setup configuration
       self.dbi.do <<-SQL
         CREATE TEXT SEARCH CONFIGURATION public.default_#{language} ( COPY = pg_catalog.#{language} );
@@ -526,7 +522,7 @@ CREATE INDEX target_id_#{table_name} ON #{table_name}(target_id);
       unless(self.dbi.columns('object').any? { |col| col.name == 'extent' })
         self.dbi.do <<-EOS
 ALTER TABLE object ADD COLUMN extent TEXT;
-CREATE INDEX extent_index ON object(extent);
+CREATE INDEX IF NOT EXISTS extent_index ON object(extent);
         EOS
       end
     end

data/lib/odba/version.rb

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

data/odba.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ydbi',   '>=0.5.1'
   spec.add_dependency 'ydbd-pg','>=0.5.1'
-  
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "flexmock"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov", '>= 0.14.1'
   spec.add_development_dependency "minitest" if /^1\./.match(RUBY_VERSION)
 end
 

data/test/test_cache.rb

@@ -16,7 +16,7 @@ require 'odba/odba_error'
 require 'odba/odba'
 
 module ODBA
-	class Cache 
+	class Cache
 		CLEANING_INTERVAL = 0
 		MAIL_RECIPIENTS = []
 		MAIL_FROM = "test@testfirst.local"
@@ -216,7 +216,7 @@ module ODBA
 			@marshal.should_receive(:load).and_return {|dump|
 				receiver
 			}
-			@storage.should_receive(:restore_collection).and_return {|*args| 
+			@storage.should_receive(:restore_collection).and_return {|*args|
 				[]
 			}
 			receiver.instance_variable_set("@odba_id", 23)
@@ -233,7 +233,7 @@ module ODBA
 		def test_fetch_error
 			receiver = flexmock
 			@storage.should_receive(:restore).and_return  { |odba_id|
-				nil	
+				nil
 			}
 			assert_raises(OdbaError) {
 				@cache.load_object(23, receiver)
@@ -289,17 +289,17 @@ module ODBA
 				assert_equal(new_collection, col)
 			}
 
-      @storage.should_receive(:restore_collection).and_return  { 
+      @storage.should_receive(:restore_collection).and_return  {
         old_collection.collect { |key, val|
-          [Marshal.dump(key.odba_isolated_stub), 
+          [Marshal.dump(key.odba_isolated_stub),
             Marshal.dump(val.odba_isolated_stub)]
         }
       }
-			@storage.should_receive(:collection_remove).and_return  { |odba_id, key| 
+			@storage.should_receive(:collection_remove).and_return  { |odba_id, key|
 				assert_equal(54, odba_id)
 				assert_equal(Marshal.dump('key1'.odba_isolated_stub), key)
 			}
-			@storage.should_receive(:collection_store).and_return  { |odba_id, key, value| 
+			@storage.should_receive(:collection_store).and_return  { |odba_id, key, value|
 				assert_equal(54, odba_id)
 				assert_equal(Marshal.dump('key3'.odba_isolated_stub), key)
 				assert_equal(Marshal.dump('val3'.odba_isolated_stub), value)
@@ -308,7 +308,7 @@ module ODBA
 			@cache.fetched = {
 				54 => cache_entry
 			}
-			
+
 			obj = flexmock('Obj')
 			obj.should_receive(:odba_id).and_return  { 54 }
 			obj.should_receive(:odba_collection).and_return  { new_collection }
@@ -349,10 +349,10 @@ module ODBA
 		end
 		def test_fill_index
 			foo = flexmock("foo")
-			foo.should_receive(:fill).and_return  { |target| 
+			foo.should_receive(:fill).and_return  { |target|
 				assert_equal("baz", target)
 			}
-			@cache.indices = { 
+			@cache.indices = {
 				"foo" => foo
 			}
 			@cache.fill_index("foo", "baz")
@@ -436,9 +436,9 @@ module ODBA
 
 				@storage.should_receive(:restore_collection).and_return  { [] }
 				if(block)
-					@storage.should_receive(:store, &block).and_return  
+					@storage.should_receive(:store, &block).and_return
 				else
-					@storage.should_receive(:store).and_return  { 
+					@storage.should_receive(:store).and_return  {
 						assert(true)
 					}
 				end
@@ -453,39 +453,39 @@ module ODBA
 			origin_obj.odba_connection = delete_item
 			@cache.fetched.store(1, delete_item)
 			@storage.should_receive(:retrieve_connected_objects).and_return  { |id|
-				[[2]] 
+				[[2]]
 			}
 			prepare_fetch(2, origin_obj)
-			@storage.should_receive(:restore_collection).and_return  { |*args| 
+			@storage.should_receive(:restore_collection).and_return  { |*args|
 				[]
 			}
 			@storage.should_receive(:store).and_return  { |id, dump, name, prefetch, klass| }
-			@storage.should_receive(:ensure_object_connections).and_return  { } 
-			@storage.should_receive(:delete_persistable).and_return  { |id| } 
+			@storage.should_receive(:ensure_object_connections).and_return  { }
+			@storage.should_receive(:delete_persistable).and_return  { |id| }
 			@marshal.should_receive(:dump).and_return  { |ob| "foo"}
 			@cache.delete(delete_item)
 			assert_equal(1, @cache.fetched.size)
-			assert_equal(nil, origin_obj.odba_connection)
+			assert_nil(origin_obj.odba_connection)
 		end
 		def prepare_delete(mock, name, id)
 			mock.should_receive(:odba_id).and_return  { id }
 			mock.should_receive(:odba_name).and_return  { name }
 			mock.should_receive(:odba_notify_observers).and_return  { |key, id1, id2|
-        assert_equal(:delete, key) 
+        assert_equal(:delete, key)
       }
 			@storage.should_receive(:retrieve_connected_objects).and_return  { |id|
 				[]
 			}
 			mock.should_receive(:origin_class?).and_return  { true }
 			mock.should_receive(:odba_id).and_return  { id }
-			@storage.should_receive(:delete_persistable).and_return  { |id_arg| 
+			@storage.should_receive(:delete_persistable).and_return  { |id_arg|
 				assert_equal(id, id_arg)
 			}
 			@storage.should_receive(:delete_index_element).and_return  { }
 		end
 		def prepare_bulk_restore(rows)
 			rows.each { |odba_mock|
-        ## according to recent changes, objects are extended with 
+        ## according to recent changes, objects are extended with
         #  ODBA::Persistable after loading - this enables ad-hoc storing
         #  but messes up loads of tests
 				@marshal.should_receive(:load).and_return  { |dump|
@@ -591,7 +591,7 @@ module ODBA
       ## store o1
       @marshal.should_receive(:dump).times(3).and_return { |obj|
         "dump%i" % obj.odba_id
-      } 
+      }
       next_id = 1
       @storage.should_receive(:next_id).and_return { next_id += 1 }
       @storage.should_receive(:store).with(1,'dump1',nil,nil,Object)\
@@ -631,7 +631,7 @@ module ODBA
         .times(1).and_return(o4)
       @cache.fetched.store(1, ODBA::CacheEntry.new(o1))
       assert_raises(RuntimeError) {
-        ODBA.transaction { 
+        ODBA.transaction {
           o2.instance_variable_set('@other', o3)
           o1.instance_variable_set('@other', o2)
           o1.odba_store

data/test/test_persistable.rb

@@ -30,7 +30,7 @@ module ODBA
 		class ODBAContainerInPersistable
 		 include ODBA::Persistable
 		 ODBA_SERIALIZABLE = ['@serializable']
-		 attr_accessor	:non_replaceable, :replaceable, :replaceable2, 
+		 attr_accessor	:non_replaceable, :replaceable, :replaceable2,
 			:array, :odba_persistent, :serializable
 		 attr_accessor	:odba_snapshot_level
 		end
@@ -181,11 +181,11 @@ module ODBA
 			level1.replaceable = level2
 
 			saved.odba_persistent = true
-			ODBA.cache.should_receive(:store).times(3).and_return { 
+			ODBA.cache.should_receive(:store).times(3).and_return {
         assert(true)
         2
       }
-			
+
 			@odba.odba_store_unsaved
 		end
 		def test_odba_store_unsaved_hash
@@ -196,12 +196,12 @@ module ODBA
 			level1.replaceable = hash
 			level1.non_replaceable = non_rep_hash
 			non_rep_hash.odba_persistent = true
-			
-			ODBA.cache.should_receive(:store).times(2).and_return { 
+
+			ODBA.cache.should_receive(:store).times(2).and_return {
         assert(true)
         2
       }
-			
+
 			level1.odba_store_unsaved
 		end
     def test_dup
@@ -225,8 +225,8 @@ module ODBA
 			odba_twin = @odba.odba_dup
 			odba_twin.replaceable.flexmock_verify
 			odba_twin.replaceable2.flexmock_verify
-			assert_equal(odba_twin, stub_container)	
-			assert_equal(odba_twin, stub_container2)	
+			assert_equal(odba_twin, stub_container)
+			assert_equal(odba_twin, stub_container2)
 		end
 		def test_odba_unsaved_true
 			@odba.instance_variable_set("@odba_persistent", false)
@@ -282,7 +282,7 @@ module ODBA
       ODBA.cache.should_receive(:next_id).and_return(1)
 			dump, hash = odba.odba_isolated_dump
 			obj = ODBA.marshaller.load(dump)
-			assert_equal(nil, obj.excluded)
+			assert_nil(obj.excluded)
 			assert_equal("baz", obj.included)
 			ODBA.marshaller = tmp
 		end
@@ -385,7 +385,7 @@ module ODBA
       }
       ODBA.cache.should_receive(:retrieve_from_index).with(name, args)\
         .times(1).and_return([result])
-      assert_equal([result], 
+      assert_equal([result],
                    IndexedStub.search_by_foo_and_bar('oof', 'rab'))
 
       ## exact search by multiple keys
@@ -393,11 +393,11 @@ module ODBA
       ODBA.cache.should_receive(:retrieve_from_index)\
         .with(name, args, Persistable::Exact)\
         .times(1).and_return([result])
-      assert_equal([result], 
+      assert_equal([result],
                    IndexedStub.search_by_exact_foo_and_bar('oof', 'rab'))
 
       ## find by multiple keys
-      args = {:foo => {'value' => 7,'condition' => '='}, 
+      args = {:foo => {'value' => 7,'condition' => '='},
               :bar => {'value' => 'rab','condition' => 'like'}}
       ODBA.cache.should_receive(:retrieve_from_index)\
         .with(name, args, Persistable::Find)\
@@ -497,7 +497,7 @@ module ODBA
 
       modified.instance_variable_set('@data', 'bar')
       assert_equal('bar', modified.instance_variable_get('@data'))
-      
+
       modified.odba_replace!(reloaded)
       assert_equal('foo', modified.instance_variable_get('@data'))
     end
@@ -553,5 +553,5 @@ module ODBA
       o = ODBAContainerInPersistable.new
       assert_equal([], o.odba_collection)
     end
-	end	
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odba
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ydbi
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
 description: Object Database Access
 email: mhatakeyama@ywesee.com, zdavatz@ywesee.com
 executables: []
@@ -165,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby Software for ODDB.org Memory Management
 test_files: []
-has_rdoc: