og 0.11.0 → 0.12.0

data/lib/og/adapters/mysql.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: mysql.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: mysql.rb 270 2005-03-07 17:52:16Z gmosx $
 
 require 'mysql'
 
@@ -19,6 +19,7 @@ class MysqlAdapter < Adapter
 	def initialize
 		super
 		@typemap.update(TrueClass => 'tinyint')
+		@typecast.update(TrueClass => "#\{:s: ? \"1\" : 'NULL' \}")
 	end
 	
 	def self.escape(str)
@@ -118,6 +119,43 @@ class MysqlAdapter < Adapter
 		res.free if res
 	end
 
+	def create_fields(klass)
+		fields = []
+		
+		klass.__props.each do |p|
+			klass.sql_index(p.symbol) if p.meta[:sql_index]
+				
+			field = "#{p.symbol}"
+			
+			if p.meta and p.meta[:sql]
+				field << " #{p.meta[:sql]}"
+			else
+				field << " #{@typemap[p.klass]}"
+				
+				if p.meta
+					# set default value (gmosx: not that useful in the
+					# current implementation).
+					if default = p.meta[:default]
+						field << " DEFAULT #{default.inspect} NOT NULL"
+					end
+				
+					# set unique
+					# FIXME: correctly handle UNIQUE constrain.
+					# field << " UNIQUE" if p.meta[:unique]
+
+					# attach extra sql
+					if extra_sql = p.meta[:extra_sql]
+						field << " #{extra_sql}"
+					end
+				end
+			end
+			
+			fields << field 
+		end
+
+		return fields
+	end
+
 	def create_table(klass, db)
 		conn = db.get_connection
 
@@ -165,11 +203,11 @@ class MysqlAdapter < Adapter
 		if klass.__meta and joins = klass.__meta[:sql_join] 
 			for data in joins
 				# the class to join to and some options.
-				join_class, options = *data
+				join_name, join_class, options = *data
 				
 				# gmosx: dont use DBTABLE here, perhaps the join class
 				# is not managed yet.
-				join_table = "#{self.class.join_table(klass, join_class)}"
+				join_table = "#{self.class.join_table(klass, join_class, join_name)}"
 				join_src = "#{self.class.encode(klass)}_oid"
 				join_dst = "#{self.class.encode(join_class)}_oid"
 				begin

data/lib/og/adapters/oracle.rb

@@ -1,7 +1,7 @@
 # * Matt Bowen  <matt.bowen@farweststeel.com>
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: oracle.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: oracle.rb 270 2005-03-07 17:52:16Z gmosx $
 
 require 'oracle'
 
@@ -28,6 +28,7 @@ class OracleAdapter < Adapter
       Array => 'varchar2(1024)',
       Hash => 'varchar2(1024)'
     )
+		@typecast.update(TrueClass => "#\{:s: ? \"1\" : 'NULL' \}")
   end
 
   def self.timestamp(time = Time.now)
@@ -190,11 +191,11 @@ class OracleAdapter < Adapter
     if klass.__meta and joins = klass.__meta[:sql_join] 
       for data in joins
         # the class to join to and some options.
-        join_class, options = *data
+        join_name, join_class, options = *data
         
         # gmosx: dont use DBTABLE here, perhaps the join class
         # is not managed yet.
-        join_table = "#{self.class.join_table(klass, join_class)}"
+        join_table = "#{self.class.join_table(klass, join_class, join_name)}"
         join_src = "#{self.class.encode(klass)}_oid"
         join_dst = "#{self.class.encode(join_class)}_oid"
         begin

data/lib/og/adapters/psql.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: psql.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: psql.rb 270 2005-03-07 17:52:16Z gmosx $
 
 require 'postgres'
 
@@ -137,11 +137,11 @@ class PsqlAdapter < Adapter
 		if klass.__meta and joins = klass.__meta[:sql_join] 
 			for data in joins
 				# the class to join to and some options.
-				join_class, options = *data
+				join_name, join_class, options = *data
 				
 				# gmosx: dont use DBTABLE here, perhaps the join class
 				# is not managed yet.
-				join_table = "#{self.class.join_table(klass, join_class)}"
+				join_table = "#{self.class.join_table(klass, join_class, join_name)}"
 				join_src = "#{self.class.encode(klass)}_oid"
 				join_dst = "#{self.class.encode(join_class)}_oid"
 				begin

data/lib/og/adapters/sqlite.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: sqlite.rb 263 2005-02-23 13:45:08Z gmosx $
+# $Id: sqlite.rb 270 2005-03-07 17:52:16Z gmosx $
 
 require 'sqlite3'
 require 'fileutils'
@@ -142,11 +142,11 @@ class SqliteAdapter < Adapter
 		if klass.__meta and joins = klass.__meta[:sql_join] 
 			for data in joins
 				# the class to join to and some options.
-				join_class, options = *data
+				join_name, join_class, options = *data
 				
 				# gmosx: dont use DBTABLE here, perhaps the join class
 				# is not managed yet.
-				join_table = "#{self.class.join_table(klass, join_class)}"
+				join_table = "#{self.class.join_table(klass, join_class, join_name)}"
 				join_src = "#{self.class.encode(klass)}_oid"
 				join_dst = "#{self.class.encode(join_class)}_oid"
 				begin

data/lib/og/connection.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: connection.rb 265 2005-02-24 08:46:54Z gmosx $
+# $Id: connection.rb 270 2005-03-07 17:52:16Z gmosx $
 
 module Og; 
 
@@ -270,6 +270,10 @@ class Connection
 	#
 	# obj_or_oid = Object or oid to delete.
 	# klass = Class of object (can be nil if an object is passed)
+	#
+	#--
+	# TODO: pre evaluate for symmetry to the other methods
+	#++
 	
 	def delete(obj_or_oid, klass = nil, cascade = true)
 		oid = obj_or_oid.to_i

data/lib/og/database.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: database.rb 265 2005-02-24 08:46:54Z gmosx $
+# $Id: database.rb 270 2005-03-07 17:52:16Z gmosx $
 
 require 'glue/logger'
 require 'glue/attribute'
@@ -12,6 +12,7 @@ require 'glue/pool'
 
 require 'og/enchant'
 require 'og/meta'
+require 'og/observer'
 
 module Og
 	
@@ -68,7 +69,6 @@ class Database
 		@managed_classes = N::SafeHash.new
 		
 		@config[:connection_count].times do
-			# @connection_pool << Og::Connection.new(self)
 			@connection_pool << @adapter.new_connection(self)
 		end
 	
@@ -148,11 +148,10 @@ class Database
 	end
 	alias_method :open, :connect
 	
-	
 	# Register a standard Ruby class as managed.
 	
 	def manage(klass)
-		return if managed?(klass) or klass.ancestors.include?(Og::Unmanageable)
+		return if managed?(klass) or klass.ancestors.include?(Unmanageable)
 		
 		@managed_classes[klass] = ManagedClassMeta.new(klass)
 		
@@ -194,22 +193,31 @@ class Database
 		klass.class_eval %{
 			DBTABLE = "#{Adapter.table(klass)}"
 			DBSEQ = "#{Adapter.table(klass)}_oid_seq" 
-			
-			def to_i()
+	
+			cattr_accessor :og_db
+
+			def to_i
 				@oid
 			end			
 		}
 
+		# Set the adapter.
+
+		klass.og_db = self
+		
+		# Add observer support.
+		
+		klass.extend(Observable)
+
 		# Create the schema for this class if not available.
+		
 		@adapter.create_table(klass, self) if Og.create_schema				
 
-		# Precompile some code that gets executed all the time.
-		# Deletion code is not precompiled, because it is not used
-		# as frequently.
+		# @adapter.eval_og_insert(klass, self)
+		# @adapter.eval_og_update(klass, self)
+		# @adapter.eval_og_read(klass, self)
 
-		@adapter.eval_og_insert(klass, self)
-		@adapter.eval_og_update(klass, self)
-		@adapter.eval_og_read(klass, self)
+		@adapter.eval_lifecycle_methods(klass, self)
 	end
 	
 	# Automatically wrap connection methods.
@@ -251,17 +259,23 @@ class Database
 	wrap_method :exec, 'sql'
 
 	class << self
+
+		# Create a new database.
+
 		def create_db!(config)
 			adapter = Adapter.for_name(config[:adapter])
 			adapter.create_db(config[:database], config[:user], config[:password])
 		end
 		alias_method :create!, :create_db!
 
+		# Drop an existing database.
+
 		def drop_db!(config)
 			adapter = Adapter.for_name(config[:adapter])
 			adapter.drop_db(config[:database], config[:user], config[:password])
 		end
 		alias_method :drop!, :drop_db!
+		
 	end
 end
 

data/lib/og/enchant.rb

@@ -10,54 +10,65 @@ module Enchant
 	# to the class and its instances. 
 	
 	def enchant(klass)
-		klass.module_eval <<-"end_eval", __FILE__, __LINE__
+
+		# Generate standard methods.
+		
+		klass.module_eval %{ 
 			def self.create(*params, &block)
 				obj = #{klass}.new(*params, &block)
 				obj.save!
 			end
 				
 			def self.save(obj)
-				Og.db << obj
+				@@og_db << obj
 			end
 			
 			def self.load(oid_or_name)
-				Og.db.load(oid_or_name, #{klass})
+				@@og_db.load(oid_or_name, #{klass})
 			end
 
 			def self.get(oid_or_name)
-				Og.db.load(oid_or_name, #{klass})
+				@@og_db.load(oid_or_name, #{klass})
 			end
 			
 			def self.[](oid_or_name)
-				Og.db.load(oid_or_name, #{klass})
+				@@og_db.load(oid_or_name, #{klass})
 			end
 			
 			def self.load_all(extra_sql = nil)
-				Og.db.load_all(#{klass}, extra_sql)
+				@@og_db.load_all(#{klass}, extra_sql)
 			end
 			
 			def self.all(extra_sql = nil)
-				Og.db.load_all(#{klass}, extra_sql)
+				@@og_db.load_all(#{klass}, extra_sql)
 			end
 
 			def self.count(sql = "SELECT COUNT(*) FROM #{klass::DBTABLE}")
-				Og.db.count(sql, #{klass})
+				@@og_db.count(sql, #{klass})
 			end
 
 			def self.select(sql)
-				Og.db.select(sql, #{klass})
+				@@og_db.select(sql, #{klass})
+			end
+			
+			def self.find(sql)
+				@@og_db.select(sql, #{klass})
 			end
 
 			def self.select_one(sql)
-				Og.db.select_one(sql, #{klass})
+				@@og_db.select_one(sql, #{klass})
+			end
+
+			def self.find_one(sql)
+				@@og_db.select_one(sql, #{klass})
 			end
 
 			def self.one(sql)
-				Og.db.select_one(sql, #{klass})
+				@@og_db.select_one(sql, #{klass})
 			end
 			
 			def self.delete(obj_or_oid)
-				Og.db.delete(obj_or_oid, #{klass})
+				@@og_db.delete(obj_or_oid, #{klass})
 			end
 
 			def self.properties_and_relations
@@ -70,20 +81,43 @@ module Enchant
 			include Enumerable
 			
 			def save
-				Og.db << self
+				@@og_db << self
 				return self
 			end
 			alias_method :save!, :save
 			
 			def update_properties(updatesql)
-				Og.db.pupdate(updatesql, self.oid, #{klass})
+				@@og_db.pupdate(updatesql, self.oid, #{klass})
 			end
 			alias_method :pupdate!, :update_properties
 			
 			def delete!
-				Og.db.delete(@oid, #{klass})
+				@@og_db.delete(@oid, #{klass})
 			end
-		end_eval
+		}
+
+		# Generate finder methods.
+	
+		code = ''
+		
+		for p in klass.__props
+			code << %{
+				def self.find_by_#{p.name}(val, operator = '=', extra_sql = nil)
+			}
+
+			val = klass.og_db.adapter.typecast[p.klass].gsub(/\:s\:/, 'val')
+			
+			if p.meta[:unique]
+				code <<	%{@@og_db.select_one("#{p.name}\#\{operator\}#{val} \#\{extra_sql\}", #{klass})}
+			else
+				code <<	%{@@og_db.select("#{p.name}\#\{operator\}#{val} \#\{extra_sql\}", #{klass})}
+			end
+			code << %{
+				end; 
+			}
+		end
+	
+		klass.module_eval(code)
 	end
 
 end

data/lib/og/meta.rb

@@ -1,6 +1,6 @@
 # * George Moschovitis  <gm@navel.gr>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: meta.rb 266 2005-02-28 14:50:48Z gmosx $
+# $Id: meta.rb 270 2005-03-07 17:52:16Z gmosx $
 #--
 # TODO:
 # - precreate the meta sql statements as much as possible to 
@@ -135,7 +135,7 @@ module MetaLanguage
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
 
-		linkback = options[:linkback] || "#{MetaUtils.expand(self)}_oid"
+		linkback = (options[:linkback].to_s || "#{MetaUtils.expand(self)}_oid").to_s
 		
 		meta :descendants, klass, linkback
 		meta :props_and_relations, HasOne.new(name, klass, :linkback => linkback)
@@ -175,7 +175,7 @@ module MetaLanguage
 		# linkback is the property of the child object that 'links back' 
 		# to this object. 
 
-		linkback = options[:linkback] || "#{MetaUtils.expand(self)}_oid"
+		linkback = (options[:linkback] || "#{MetaUtils.expand(self)}_oid").to_s
 		
 		# keep belongs to metadata, useful for 
 		# reflection/scaffolding.
@@ -231,7 +231,7 @@ module MetaLanguage
 	def many_to_many(name, klass, options = {})
 		list_o = name.to_s
 		prop_o = N::Inflector.singularize(list_o)
-		list_m = options[:linkback] || N::Inflector.plural_name(self) 
+		list_m = (options[:linkback] || N::Inflector.plural_name(self)).to_s
 		prop_m = N::Inflector.singularize(list_m)
 	
 		# Exit if the class is allready indirectly 'enchanted' from the
@@ -242,7 +242,7 @@ module MetaLanguage
 		# Add some metadata to the class to allow for automatic join table
 		# calculation.
 
-		meta :sql_join, klass, options
+		meta :sql_join, name, klass, options
 
 		# FIXME: should add metadata for cascading delete.
 
@@ -253,25 +253,25 @@ module MetaLanguage
 		
 		module_eval %{
 			def #{list_o}(extrasql = nil)
-				Og.db.select("SELECT d.* FROM #{Og::Adapter.table(klass)} d, #{Og::Adapter.join_table(self, klass)} j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT d.* FROM #{Og::Adapter.table(klass)} d, #{Og::Adapter.join_table(self, klass, name)} j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 		end
 
 			def #{list_o}_count(extrasql = nil)
-				Og.db.select("SELECT COUNT(*) FROM #{Og::Adapter.table(klass)} d, #{Og::Adapter.join_table(self, klass)} j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
+				Og.db.select("SELECT COUNT(*) FROM #{Og::Adapter.table(klass)} d, #{Og::Adapter.join_table(self, klass, name)} j WHERE j.key1=\#\@oid AND j.key2=d.oid \#\{extrasql\}", #{klass})
 			end						
 			
 			def add_#{prop_o}(obj = nil)
 				yield(obj = #{klass}.new) unless obj
 				obj.save! unless obj.oid
-				Og.db.exec("INSERT INTO #{Og::Adapter.join_table(self, klass)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
+				Og.db.exec("INSERT INTO #{Og::Adapter.join_table(self, klass, name)} (key1, key2) VALUES (\#\@oid, \#\{obj.oid\})") 
 			end
 			
 			def delete_#{prop_o}(obj_or_oid)
-				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key2=\#\{obj_or_oid.to_i\}") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass, name)} WHERE key2=\#\{obj_or_oid.to_i\}") 
 			end
 
 			def clear_#{list_o}
-				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key1=\#\@oid") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass, name)} WHERE key1=\#\@oid") 
 			end			
 		}
 		
@@ -279,25 +279,25 @@ module MetaLanguage
 		
 		klass.module_eval %{
 			def #{list_m}(extrasql = nil)
-				Og.db.select("SELECT s.* FROM #{Og::Adapter.table(self)} s, #{Og::Adapter.join_table(self, klass)} j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
+				Og.db.select("SELECT s.* FROM #{Og::Adapter.table(self)} s, #{Og::Adapter.join_table(self, klass, name)} j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 
 			def #{list_m}_count(extrasql = nil)
-				Og.db.select("SELECT COUNT(*) FROM #{Og::Adapter.table(self)} s, #{Og::Adapter.join_table(self, klass)} j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
+				Og.db.select("SELECT COUNT(*) FROM #{Og::Adapter.table(self)} s, #{Og::Adapter.join_table(self, klass, name)} j WHERE j.key2=\#\@oid AND j.key1=s.oid \#\{extrasql\}", #{self})
 			end
 			
 			def add_#{prop_m}(obj = nil)
 				yield(obj = #{self}.new) unless obj
 				obj.save! unless obj.oid
-				Og.db.exec("INSERT INTO #{Og::Adapter.join_table(self, klass)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
+				Og.db.exec("INSERT INTO #{Og::Adapter.join_table(self, klass, name)} (key1, key2) VALUES (\#\{obj.oid\}, \#\@oid)") 
 			end
 			
 			def delete_#{prop_m}(obj_or_oid)
-				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key1=\#\{obj_or_oid.to_i\}") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass, name)} WHERE key1=\#\{obj_or_oid.to_i\}") 
 			end
 
 			def clear_#{list_m}
-				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass)} WHERE key2=\#\@oid") 
+				Og.db.exec("DELETE FROM #{Og::Adapter.join_table(self, klass, name)} WHERE key2=\#\@oid") 
 			end			
 		}
 	end