og 0.40.0 → 0.41.0

data/lib/og/markers.rb

@@ -7,7 +7,7 @@ module Og
 # Marker module. If included in a class, the Og automanager
 # ignores this class.
 
-module Unmanageable; 
+module Unmanageable
   def self.included(base)
     Og.unmanageable_classes << base
   end
@@ -18,6 +18,14 @@ end
 # pattern. Ie, all the subclasses of the base
 # class are stored in the same schema (table).
 
-module SchemaInheritanceBase; end
+module SchemaInheritanceBase
+  def self.included(base)
+    
+    # This class is a superclass in a single table inheritance
+    # chain. So inject a special class ogtype field that 
+    # holds the class name.
+    base.attr_accessor :ogtype, String, :sql => 'VARCHAR(30)'
+  end
+end
 
 end

data/lib/og/store/sql.rb

@@ -350,7 +350,7 @@ class SqlStore < Store
     if table_type = @options[:table_type]
       sql << ") TYPE = #{table_type};"  
     else
-      sql << ");"
+      sql << ")"
     end
 
     # Create indices.
@@ -639,7 +639,7 @@ class SqlStore < Store
     if klass.schema_inheritance?
       for desc in klass.schema_inheritance_root_class.descendents
         attrs.concat desc.serializable_attributes
-      end  
+      end
     end
     return attrs.uniq
   end
@@ -679,15 +679,6 @@ class SqlStore < Store
     fields = []
     attrs = serializable_attributes_for_class(klass)
 
-    # FIXME: move to serializable attributes.
-    
-    if klass.schema_inheritance?
-      # This class is a superclass in a single table inheritance
-      # chain. So inject a special class ogtype field that 
-      # holds the class name.
-      fields << "ogtype VARCHAR(30)"
-    end
-    
     for a in attrs
       anno = klass.ann[a]
       if anno.null?
@@ -867,8 +858,7 @@ class SqlStore < Store
     # an ogtype serializable attribute.
     
     if klass.schema_inheritance?
-      fields << :ogtype
-      values << quote(klass.name)
+      values[fields.index(:ogtype)] = quote(klass.name)
     end
 
     fields = fields.join(', ')
@@ -1007,7 +997,14 @@ class SqlStore < Store
     if klass.schema_inheritance? 
       klass.module_eval %{
         def self.og_allocate(res, row = 0)
-          Object.constant(res[0]).allocate
+          Object.constant(res['ogtype']).allocate
+        rescue TypeError => e
+          # TODO: use res['ogtype'] here, this is slow!
+          # But res['ogtype'] isn't implemented in -pr and some mysql exts,
+          # create compat layer
+          col = ogmanager.store.create_field_map(self)[:ogtype]
+          ogmanager.put_store
+          Object.constant(res[col]).allocate
         end
       }
     else

data/lib/og/store/sql/evolution.rb

@@ -60,7 +60,7 @@ module Evolution
     return unless @options[:evolve_schema]
 
     sql_fields = create_field_map(klass).keys
-    attrs = klass.serializable_attributes
+    attrs = serializable_attributes_for_class(klass)
 
     # Add new fields to the table.
     

data/test/glue/tc_taggable.rb

@@ -18,22 +18,38 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
       @title = title
     end
   end
+  
+  class Second
+    attr_accessor :haha, String
+    is Taggable
+  end
 
-  $og1.manage_classes(Article, Tag)
-
-  def test_all
-    a1 = Article.create('Hello')
-    a1.tag('great gmosx sexy')
-    a1.save
+  $og1.manage_classes(Article, Tag, Second)
+  
+  def setup
+    @a1 = Article.create('Hello')
+    @a1.tag('great gmosx sexy')
+    @a1.save
     
-    a2 = Article.create('Other')
-    a2.tag('gmosx rain')
-    a2.save
+    @a2 = Article.create('Other')
+    @a2.tag('gmosx rain')
+    @a2.save
     
-    a3 = Article.create('George')
-    a3.tag('phd name')
-    a3.save
+    @a3 = Article.create('George')
+    @a3.tag('phd name')
+    @a3.save
+    
+    @s1 = Second.create
+    @s1.tag('gmosx')
+    @s1.save
+  end
+  
+  def teardown
+    [Tag, Article, Second].each {|x| x.delete_all }
+  end
 
+  def test_all
+    a1, a2, a3 = @a1, @a2, @a3
 
     assert_equal 6, Tag.count
     assert_equal 3, a1.tags.size 
@@ -71,6 +87,13 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
       assert n, tag.count
     end
     
+    a = Second.create
+    b = Second.create
+    b.tag('hello world heh')
+    a.tag('hello heh george gmosx')
+    
+    assert_equal 2, Second.find_with_tags('hello', 'heh').size
+    
 =begin
     TODO:
     Article.fing_with_no_tag('gmosx')
@@ -78,5 +101,17 @@ class TestOgTaggable < Test::Unit::TestCase # :nodoc: all
     Article.find_by_tags(:with => '', :any => '', :no => '')
 =end
   end
+  
+  def test_tag_tagged
+    t = Tag.find_by_name('gmosx')
+    
+    assert_not_nil t
+    assert_equal 'gmosx', t.name
+    
+    a = Article.relations.reject {|x| x.name != :tags }.first
+    assert_equal Article, a.owner_class
+    
+    assert_equal [@a1, @a2, @s1], t.tagged
+  end
 
 end

data/test/og/CONFIG.rb

@@ -43,7 +43,7 @@ og_mysql = {
 
 og_psql = {
   :destroy => true,
-  :adapter => :psql,
+  :adapter => :postgresql,
   :user => 'postgres',
   :password => 'postgres',
   :name => 'test'

data/test/og/store/tc_sti2.rb

@@ -22,7 +22,7 @@ class TC_STI2 < Test::Unit::TestCase
   class Admin < User
     property :admin_praise, String
   end
-
+  
   class Login
     property :pass, String
 
@@ -35,13 +35,23 @@ class TC_STI2 < Test::Unit::TestCase
     belongs_to User
   end
   
+  # This has .initialize overridden, Bugreport from Rayman
+  class PoorUser < User
+    property :poorness, Integer
+    
+    def initialize(name = nil)
+      @poorness = 26
+      @name = name
+    end
+  end
+  
   def request
     o = OpenStruct.new
     o.params = {:name => 'George', :pass => 'Secret'}
     return o
   end
   
-  $og1.manage_classes User, Login, Admin, Pet
+  $og1.manage_classes User, Login, Admin, Pet, PoorUser
   
   def setup
     @user = Admin.create_with(request.params)
@@ -76,4 +86,15 @@ class TC_STI2 < Test::Unit::TestCase
     assert_equal 1, @user.pets(:reload => true).size
   end
   
+  def test_bugreport_rayman
+    p1 = PoorUser.create("JoJo")
+    p2 = PoorUser.find_one(:where => "name = 'JoJo'")
+    assert_equal p1.class, p2.class
+    assert_equal p1.oid, p2.oid
+    
+    p3 = User.find_one(:where => "name = 'JoJo'")
+    assert_equal p1.class, p3.class
+    assert_equal p1.oid, p3.oid
+  end
+  
 end

data/test/og/tc_inheritance2.rb

@@ -27,8 +27,10 @@ class TC_OgInheritance2 < Test::Unit::TestCase # :nodoc: all
   $og1.manage_classes(Project, FProject, DProject)
   
   def test_all
-    Project.create    
-    FProject.create    
-    DProject.create    
+    assert_nothing_raised do
+      Project.create
+      FProject.create
+      DProject.create
+    end
   end
 end

data/test/og/tc_polymorphic.rb

@@ -8,6 +8,15 @@ require 'og'
 
 class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
   include Og
+  
+  module Stuff
+    property :ahah, String
+  end
+  
+  class Article
+    include Stuff
+    property :title, String
+  end
 
   # This class is a polymorphic parent. Ie' it acts as template
   # to generate customized versions of this class.
@@ -20,10 +29,22 @@ class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
       @body = body
     end
   end
+  
+  class Component
+    include Og::EntityMixin
+    
+    belongs_to Article
+  end
 
   class Article
-    property :title, String
     has_many Comment
+    has_many Component
+    
+    class Comment < TC_OgPolymorphic::Comment
+      def to_href
+        '/article'
+      end
+    end
 
     def initialize(title)
       @title = title
@@ -40,21 +61,27 @@ class TC_OgPolymorphic < Test::Unit::TestCase # :nodoc: all
   end
 
   $og1.manage_classes(Comment, Article, User)
-
-  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
+  
+  def setup
+    @u = User.create('gmosx')
     
-    a = Article.create('test')
+    @u.comments << User::Comment.create('Hello')
+    @u.comments << User::Comment.create('World')
     
-    a.comments << Article::Comment.create('Hello2')
-    a.comments << Article::Comment.create('World2')    
+    @a = Article.create('test')
     
-    assert_equal 2, a.comments.size
+    @a.comments << Article::Comment.create('Hello2')
+    @a.comments << Article::Comment.create('World2')
+  end
+
+  def test_basic
+    assert_equal 2, @u.comments.size
+    assert_equal 2, @a.comments.size
+  end
+  
+  def test_nested
+    assert_equal 2, Article.relations.size
+    assert_equal 3, Article.serializable_attributes.size
   end
   
 end

data/test/og/tc_reldelete.rb

@@ -80,8 +80,8 @@ class TC_DeletesRelationship < Test::Unit::TestCase # :nodoc: all
     
     @u = User.create_with(:name => 'George')
     
-    @i.category = @c
-    @i.tag = @t
+    @i.category = @c; @c.save
+    @i.tag = @t; @t.save
     
     @i.pictures << @p1
     @p2.item = @i
@@ -160,4 +160,13 @@ class TC_DeletesRelationship < Test::Unit::TestCase # :nodoc: all
     assert_equal 0, n;
   end
   
+  #####
+  # Bug Reports
+  #####
+  
+  def test_jo_category_foreign_key_na
+    assert_not_nil @i.category
+    assert_equal @i.pk, @i.category.item_oid
+  end
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: og
 version: !ruby/object:Gem::Version 
-  version: 0.40.0
-date: 2006-11-13 10:56:16 +02:00
+  version: 0.41.0
+date: 2006-12-12 12:36:44 +02:00
 summary: State of the art object-relational mapping system
 require_paths: 
 - lib
@@ -65,6 +65,9 @@ files:
 - lib/og/adapter/postgresql.rb
 - lib/og/adapter/sqlite
 - lib/og/adapter/sqlite.rb
+- lib/og/adapter/oracle
+- lib/og/adapter/oracle.old.rb
+- lib/og/adapter/oracle.rb
 - lib/og/adapter/mysql/override.rb
 - lib/og/adapter/mysql/script.rb
 - lib/og/adapter/mysql/utils.rb
@@ -73,6 +76,8 @@ files:
 - lib/og/adapter/postgresql/utils.rb
 - lib/og/adapter/sqlite/override.rb
 - lib/og/adapter/sqlite/script.rb
+- lib/og/adapter/oracle/override.rb
+- lib/og/adapter/oracle/utils.rb
 - lib/og/entity/clone.rb
 - lib/og/ez/clause.rb
 - lib/og/ez/condition.rb
@@ -141,10 +146,10 @@ files:
 - test/og/store/tc_sti.rb
 - test/og/store/tc_sti2.rb
 - doc/CHANGELOG.1
+- doc/tutorial.txt
 - doc/CONTRIBUTORS
 - doc/LICENSE
 - doc/RELEASES
-- doc/tutorial.txt
 test_files: []
 
 rdoc_options: []
@@ -165,5 +170,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.40.0
+        version: 0.41.0
     version: