From 349699eaa50143d560f973564a0842d68e81e07e Mon Sep 17 00:00:00 2001
From: "Piotr Gega (pietia)" <piotrgega@gmail.com>
Date: Sun, 14 Feb 2010 23:50:09 +0100
Subject: [PATCH] Added few more supported types to specs

---
 hibernate.rb                      | 7 +++++--
 lib/dm-hibernate-adapter.rb       | 2 +-
 spec/adapter_shared_spec.rb       | 6 +++---
 spec/dm-hibernate-adapter_spec.rb | 3 +++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/hibernate.rb b/hibernate.rb
index 040aff5..59971b2 100644
--- a/hibernate.rb
+++ b/hibernate.rb
@@ -97,7 +97,6 @@ def self.add_model(mapping)
     mapping_file = mapping[/\w+.hbm.xml/] #produces ie. "Book.hbm.xml"
     unless mapped?(mapping_file)
       config.add_xml(File.read(mapping))
-      @mapped_classes ||= []
       @mapped_classes << mapping_file
     else
       puts "mapping file/class registered already"
@@ -106,6 +105,7 @@ def self.add_model(mapping)
 
   private
   def self.mapped?(mapping_file)
+    @mapped_classes ||= []
     if @mapped_classes.member?(mapping_file)
       return true
     else
@@ -114,10 +114,13 @@ def self.mapped?(mapping_file)
   end
 
   module Model
+    # TODO enhance TYPEs list
     TYPES = {
       :string => java.lang.String,
       :long => java.lang.Long,
-      :date => java.util.Date
+      :integer => java.lang.Integer,
+      :date => java.util.Date,
+      :boolean => java.lang.Boolean
     }
 
     def hibernate_sigs
diff --git a/lib/dm-hibernate-adapter.rb b/lib/dm-hibernate-adapter.rb
index 7c8567c..9c59707 100644
--- a/lib/dm-hibernate-adapter.rb
+++ b/lib/dm-hibernate-adapter.rb
@@ -17,7 +17,7 @@ def initialize(name, options = {})
         Hibernate.connection_password = ""
         Hibernate.connection_pool_size = "1"
         Hibernate.properties["hbm2ddl.auto"] = "update"
-        Hibernate.properties["format_sql"] = "true"
+        Hibernate.properties["format_sql"] = "false"
         Hibernate.properties["show_sql"] = "true"
         Hibernate.properties["cache.provider_class"] = "org.hibernate.cache.NoCacheProvider"
       end
diff --git a/spec/adapter_shared_spec.rb b/spec/adapter_shared_spec.rb
index b3f834d..bc0fc2b 100644
--- a/spec/adapter_shared_spec.rb
+++ b/spec/adapter_shared_spec.rb
@@ -21,12 +21,12 @@ class ::Heffalump
       property :id,        Serial
       property :color,     String
       # TODO add more supported types
-      #  property :num_spots, Integer
-      #  property :striped,   Boolean
+      property :num_spots, Integer
+      property :striped,   Boolean
 
       # TODO
       extend Hibernate::Model
-      hibernate_attr :id => :long, :color => :string
+      hibernate_attr :id => :long, :color => :string, :num_spots => :integer, :striped => :boolean
       hibernate!
     end
 
diff --git a/spec/dm-hibernate-adapter_spec.rb b/spec/dm-hibernate-adapter_spec.rb
index 5caae17..202e8a7 100644
--- a/spec/dm-hibernate-adapter_spec.rb
+++ b/spec/dm-hibernate-adapter_spec.rb
@@ -12,4 +12,7 @@
 
   it_should_behave_like 'An Adapter'
 
+  #TODO add hibernate specyfic specs
+  # it_should_behave_like 'An Hibernate Adapter'
+
 end