activerdf_rdflite 1.2 → 1.2.1

data/Rakefile

@@ -13,13 +13,13 @@ setup_rdoc ['README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "test and package gem"
 task :default => [:test, :package]
 
-# get VERSION from commandline
-VERSION =  '1.2'
+# get @VERSION from commandline
+@VERSION =  '1.2.1'
 NAME="activerdf_rdflite"
-GEMNAME="#{NAME}-#{VERSION}.gem"
+GEMNAME="#{NAME}-#{@VERSION}.gem"
 
 # define package task
-setup_gem(NAME,VERSION) do |spec|
+setup_gem(NAME,@VERSION) do |spec|
   spec.summary = "an RDF database for usage in ActiveRDF (based on sqlite3)" 
   spec.description = spec.summary
   spec.author="Eyal Oren <eyal.oren@deri.org"

data/lib/activerdf_rdflite/rdflite.rb

@@ -335,7 +335,11 @@ class RDFLite < ActiveRdfAdapter
 				# but on the other hand, restating the aliases gives ambiguity:
 				# "from triple as t1 join triple as t2 on ... join triple as t1 ..."
 				# is ambiguous
-				join << " join triple as #{buddyalias} on #{termjoin} = #{buddyjoin} "
+				if join_stmt.include?(buddyalias)
+					join << "and #{termjoin} = #{buddyjoin}"
+				else
+					join << " join triple as #{buddyalias} on #{termjoin} = #{buddyjoin} "
+				end
 			end
 			join_stmt << join
 			

data/test/test_rdflite.rb

@@ -205,4 +205,27 @@ class TestRdfLiteAdapter < Test::Unit::TestCase
 		assert_equal 29, TEST::Person.find_all[1].age.to_i
 		assert_equal "Another Person", TEST::Person.find_all[1].name
 	end
+
+	def test_multi_join
+		adapter = ConnectionPool.add_data_source :type => :rdflite
+		type = Namespace.lookup(:rdf, 'type')
+		transProp = Namespace.lookup(:owl, 'TransitiveProperty')
+
+		Namespace.register(:test, 'http://test.com/')
+		ancestor = Namespace.lookup(:test, 'ancestor')
+		sue = Namespace.lookup(:test, 'Sue')
+		mary = Namespace.lookup(:test, 'Mary')
+		anne = Namespace.lookup(:test, 'Anne')
+
+		adapter.add ancestor, type, transProp
+		adapter.add sue, ancestor, mary
+		adapter.add mary, ancestor, anne
+
+		# test that query with multi-join (joining over 1.p==2.p and 1.o==2.s) works
+		query = Query.new.select(:Sue, :p, :Anne)
+		query.where(:p, type, transProp)
+		query.where(:Sue, :p, :Mary)
+		query.where(:Mary, :p, :Anne)
+		assert_equal 1, query.execute.size
+	end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activerdf_rdflite
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: 1.2.1
 date: 2006-12-21 00:00:00 +01:00
 summary: an RDF database for usage in ActiveRDF (based on sqlite3)
 require_paths: