og 0.18.1 → 0.19.0

data/lib/og/store/sqlite.rb

@@ -57,8 +57,7 @@ class SqliteStore < SqlStore
 	end
 
 	def close
-# FIXME: problems when closing due to unfinalised statements.
-#		@conn.close
+		@conn.close
 		super
 	end
 	
@@ -96,6 +95,15 @@ class SqliteStore < SqlStore
 		@conn.rollback if @transaction_nesting < 1
 	end
 
+  def last_insert_rowid
+		conn.query("SELECT last_insert_rowid()").first_value.to_i
+	end
+
+	def sql_update(sql)
+		exec(sql)
+		@conn.changes
+	end
+
 private
 
 	def create_table(klass)
@@ -161,7 +169,7 @@ private
 		res = @conn.query "SELECT * FROM #{klass::OGTABLE} LIMIT 1"
 		map = {}
 		
-		fields = res.fields
+		fields = res.columns
 
 		fields.size.times do |i|
 			map[fields[i].intern] = i
@@ -176,14 +184,19 @@ private
 		pk = klass.primary_key.first
 		props = klass.properties
 		values = props.collect { |p| write_prop(p) }.join(',') 
+
+		if klass.metadata.superclass or klass.metadata.subclasses
+			props << Property.new(:ogtype, String)
+			values << ", '#{klass}'"
+		end
 		
 		sql = "INSERT INTO #{klass::OGTABLE} (#{props.collect {|p| p.symbol.to_s}.join(',')}) VALUES (#{values})"
 
 		klass.class_eval %{ 
 			def og_insert(store)
 				#{Aspects.gen_advice_code(:og_insert, klass.advices, :pre) if klass.respond_to?(:advices)}
-				store.conn.query("#{sql}").close
-				@#{pk} = store.conn.last_insert_row_id
+				store.query("#{sql}").close
+				@#{pk} = store.last_insert_rowid				
 				#{Aspects.gen_advice_code(:og_insert, klass.advices, :post) if klass.respond_to?(:advices)}
 			end
 		}
@@ -192,3 +205,6 @@ private
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>
+# * Ghislain Mary

data/test/og/mixin/tc_optimistic_locking.rb

@@ -0,0 +1,56 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+require 'og/mixin/optimistic_locking'
+
+$og = Og.setup(
+	:store => 'psql',
+	:name => 'test',
+	:user => 'postgres',
+	:password => 'navelrulez',
+	:destroy => true
+)
+
+class TC_OgLocking < Test::Unit::TestCase # :nodoc: all
+	include Og
+	
+	class Article
+		property :body, String
+		include Og::Locking
+		
+		def initialize(body)
+			@body = body
+		end
+	end
+		
+	def test_all
+		$og.manage_classes		
+		
+		Article.create('test')
+
+		a = Article[1]
+		
+		b = Article[1]
+		
+		a.body = 'Changed'
+		assert_nothing_raised do
+			a.save
+		end
+		
+		b.body = 'Ooops'
+		assert_raise(Og::StaleObjectError) do
+			b.update
+		end
+		
+		c = Article[1]
+		a.body = 'Changed again'
+		assert_nothing_raised do
+			a.update
+		end
+	end
+
+end

data/test/og/tc_inheritance.rb

@@ -0,0 +1,103 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+$DBG = true
+
+require 'test/unit'
+
+require 'og'
+
+class TC_OgInheritance < Test::Unit::TestCase # :nodoc: all
+	include Og
+
+	class Document
+		property :title, String
+		schema_inheritance
+		
+		def initialize(title)
+			@title = title
+		end		
+	end
+
+	class Article < Document
+		property :body, String
+		
+		def initialize(title, body)
+			@title, @body = title, body
+		end
+	end
+
+	class Photo < Document
+		property :url, String
+		
+		def initialize(title, url)
+			@title, @url = title, url
+		end		
+	end
+
+	def test_all
+=begin
+		@og = Og.setup(
+			:store => :memory,
+			:name => :test
+		)	
+=end
+#=begin
+		@og = Og.setup(
+			:destroy => true,
+			:store => :sqlite,
+			:name => 'test'
+		)	
+#=end
+=begin
+		@og = Og.setup(
+			:destroy => true,
+			:store => :mysql,
+			:name => 'test',
+			:user => 'root',
+			:password => 'navelrulez'
+		)	
+=end		
+		assert_equal [Document], Photo.metadata.superclass
+		assert_equal [Photo, Article], Document.metadata.subclasses
+		
+		assert Document.metadata.schema_inheritance
+
+		# propagate schema_inheritance flag.
+		
+		assert Photo.metadata.schema_inheritance
+	
+		# subclasses reuse the same table.
+		
+		assert_equal Document.table, Photo.table
+		
+		doc = Document.create('doc1')
+		Photo.create('photo1', 'http:/www.gmosx.com/photo/1')
+		Photo.create('photo2', 'http:/www.gmosx.com/photo/2')
+		Article.create('art1', 'here comes the body')
+		Article.create('art2', 'this is cool')
+		Article.create('art3', 'this is cooler')
+		
+		docs = Document.all
+
+		assert_equal 6, docs.size
+		assert_equal 'art2', docs[4].title
+
+		assert_equal Document, docs[0].class
+		assert_equal Photo, docs[1].class
+		assert_equal Article, docs[4].class
+		
+		photos = Photo.all
+		
+		assert_equal 2, photos.size
+		assert_equal 'photo2', photos[1].title
+		assert_equal 'http:/www.gmosx.com/photo/1', photos[0].url
+		
+		articles = Article.all
+		
+		assert_equal 3, articles.size
+		assert_equal 'art3', articles[2].title
+		
+		articles = Article.all(:limit => 2)
+		assert_equal 2, articles.size
+	end
+end

data/test/og/tc_polymorphic.rb

@@ -0,0 +1,64 @@
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+
+require 'test/unit'
+
+require 'og'
+
+class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
+	include Og
+
+	# This class is a polymorphic parent. Ie' it acts as template
+	# to generate customized versions of this class.
+	
+	class Comment
+		property :body, String
+		belongs_to :parent, Object # polymorphic marker !
+		
+		def initialize(body)
+			@body = body
+		end
+	end
+
+	class Article
+		property :title, String
+		has_many Comment
+
+		def initialize(title)
+			@title = title
+		end		
+	end
+	
+	class User
+		property :name, String
+		has_many Comment
+
+		def initialize(name)
+			@name = name
+		end		
+	end
+
+	def setup
+		@og = Og.setup(
+			:destroy => true,
+			:store => :sqlite,
+			:name => 'test'
+		)		
+	end
+
+	def test_all
+		u = User.create('gmosx')
+		
+		u.comments << User::Comment.create('Hello')
+		u.comments << User::Comment.create('World')
+
+		assert_equal 2, u.comments.size
+		
+		a = Article.create('test')
+		
+		a.comments << Article::Comment.create('Hello2')
+		a.comments << Article::Comment.create('World2')		
+		
+		assert_equal 2, a.comments.size
+	end
+	
+end

data/test/og/tc_store.rb

@@ -1,6 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 
-#$DBG = true
+$DBG = true
 
 require 'test/unit'
 
@@ -77,7 +77,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 #		conversions_test
 	end
 =end
-#=begin	
+=begin	
 	def test_psql
 		@og = Og.setup(
 			:destroy => true,
@@ -90,7 +90,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 		features_test
 		conversions_test
 	end
-#=end
+=end
 =begin
 	def test_mysql
 		@og = Og.setup(
@@ -98,13 +98,14 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 			:store => :mysql,
 			:name => 'test',
 			:user => 'root',
+			:table_type => 'InnoDB',
 			:password => 'navelrulez'
 		)
 		features_test
 #		conversions_test
 	end
 =end
-=begin
+#=begin
 	def test_sqlite
 		@og = Og.setup(
 			:destroy => true,
@@ -114,7 +115,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 		features_test
 		conversions_test
 	end
-=end
+#=end
 =begin
 	def test_memory
 		@og = Og.setup(
@@ -136,6 +137,39 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 
 		assert_equal a1.body, a2.body
 
+		# custom select.
+		
+		acs = Article.select("SELECT * FROM #{Article.table} WHERE oid=1")
+		assert_equal 'Article 1', acs.first.body
+
+		acs = Article.select_one("SELECT * FROM #{Article.table} WHERE oid=1")
+		assert_equal 'Article 1', acs.body
+
+		acs = Article.select_one("WHERE oid=1")
+		assert_equal 'Article 1', acs.body
+
+		acs = Article.find(:sql => "SELECT * FROM #{Article.table} WHERE oid=1")
+		assert_equal 'Article 1', acs.first.body
+
+		# prefered way?
+		
+		acs = Article.find(:sql => "WHERE oid=1")
+		assert_equal 'Article 1', acs.first.body
+		
+		# exist?
+		
+		assert Article.exist?(1)
+		assert_equal nil, Article.exist?(999)
+
+		# update
+		
+		a = Article[1]
+		a.body = 'Changed'
+		# test affected rows.
+		assert_equal 1, a.save		
+		
+		# 
+		
 		a3 = Article.create do |a|
 			a.title = 'Title 3'
 			a.body = 'Article 3'
@@ -177,7 +211,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 
 		c1.reload
 		assert_equal 'Comment 4', c1.body
-		
+
 		# count
 		
 		assert_equal 4, @og.store.count(:class => Comment)
@@ -187,7 +221,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 
 		# update_properties
 
-		Comment.update_properties('@hits = @hits + 1')
+		assert_equal 4, Comment.update_properties('@hits = @hits + 1')
 		cc = Comment[1]
 		assert_equal 1, cc.hits
 		Comment.update_properties('@hits = @hits + 1', :condition => 'oid = 1')
@@ -199,15 +233,15 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 
 		# update selected properties.
 
-		cc.hits = 5
-		cc.update(:hits)		
+		cc.hits = 5		
+		cc.update :only => :hits
 		assert_equal 5, cc.hits
 		cc.reload
 		assert_equal 5, cc.hits
 		
 		cc.hits += 1
 		cc.body = 'Wow!'
-		cc.update(:hits, :body)
+		cc.update :only => [:hits, :body]
 		cc.reload
 		assert_equal 'Wow!', cc.body
 				

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.18.1
-date: 2005-06-01
+  version: 0.19.0
+date: 2005-06-17
 summary: Og (ObjectGraph)
 require_paths: 
   - lib
@@ -69,11 +69,11 @@ files:
   - lib/og/mixin/orderable.rb
   - lib/og/mixin/timestamped.rb
   - lib/og/mixin/tree.rb
+  - lib/og/mixin/optimistic_locking.rb
   - lib/og/store/filesys.rb
   - lib/og/store/psql.rb
   - lib/og/store/sql.rb
   - lib/og/store/mysql.rb
-  - lib/og/store/madeleine.rb
   - lib/og/store/sqlserver.rb
   - lib/og/store/sqlite.rb
   - lib/og/store/kirby.rb
@@ -85,13 +85,16 @@ files:
   - test/og
   - test/og/store
   - test/og/mixin
+  - test/og/tc_inheritance.rb
   - test/og/tc_types.rb
   - test/og/tc_relation.rb
   - test/og/tc_store.rb
+  - test/og/tc_polymorphic.rb
   - test/og/store/tc_filesys.rb
   - test/og/mixin/tc_hierarchical.rb
   - test/og/mixin/tc_orderable.rb
   - test/og/mixin/tc_timestamped.rb
+  - test/og/mixin/tc_optimistic_locking.rb
 test_files: []
 rdoc_options: 
   - "--main"
@@ -117,7 +120,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.18.1
+            version: 0.19.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: facets