nitro 0.8.0 → 0.9.3

data/lib/og/backend.rb

@@ -2,7 +2,7 @@
 # * George Moschovitis  <gm@navel.gr>
 #
 # (c) 2004 Navel, all rights reserved.
-# $Id: backend.rb 197 2004-12-21 13:50:17Z gmosx $
+# $Id: backend.rb 202 2005-01-17 10:44:13Z gmosx $
 
 require "yaml"
 

data/lib/og/backends/mysql.rb

@@ -1,39 +1,35 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
 # * Elias Athanasopoulos  <elathan@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: mysql.rb 194 2004-12-20 20:23:57Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: mysql.rb 248 2005-01-31 13:38:34Z gmosx $
 
-require "mysql"
+require 'mysql'
 
-require "og/backend"
+require 'og/backend'
 
 class Og
 
-# = MysqlBackend
-#
 # Implements a MySQL powered backend.
-#
+
 class MysqlBackend < Og::Backend
 
 	# A mapping between Ruby and SQL types.
-	#
+	
 	TYPEMAP = {
-		Integer => "integer",
-		Fixnum => "integer",
-		Float => "float",
-		String => "text",
-		Time => "timestamp",
-		Date => "date",
-		TrueClass => "boolean",
-		Object => "text",
-		Array => "text",
-		Hash => "text"		
+		Integer => 'integer',
+		Fixnum => 'integer',
+		Float => 'float',
+		String => 'text',
+		Time => 'timestamp',
+		Date => 'date',
+		TrueClass => 'tinyint',
+		Object => 'text',
+		Array => 'text',
+		Hash => 'text'		
 	}
 	
 	# Intitialize the connection to the RDBMS.
-	# 		
+	 		
 	def initialize(config)
 		begin
 			@conn = Mysql.connect(config[:address], config[:user], 
@@ -53,7 +49,7 @@ class MysqlBackend < Og::Backend
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Escape an SQL string
-	#
+	
 	def self.escape(str)
 		return nil unless str
 		return Mysql.quote(str)
@@ -61,7 +57,7 @@ class MysqlBackend < Og::Backend
 
 	# Convert a ruby time to an sql timestamp.
 	# TODO: Optimize this
-	# 
+	 
 	def self.timestamp(time = Time.now)
 		return nil unless time
 		return time.strftime("%Y%m%d%H%M%S")
@@ -69,7 +65,7 @@ class MysqlBackend < Og::Backend
 	
 	# Output YYY-mm-dd
 	# TODO: Optimize this
-	#
+	
 	def self.date(date)
 		return nil unless date
 		return "#{date.year}-#{date.month}-#{date.mday}" 
@@ -77,14 +73,14 @@ class MysqlBackend < Og::Backend
 	
 	# Parse sql datetime
 	# TODO: Optimize this
-	#
+	
 	def self.parse_timestamp(str)
 		return Time.parse(str)		
 	end
 	
 	# Input YYYY-mm-dd
 	# TODO: Optimize this
-	#
+	
 	def self.parse_date(str)
 		return nil unless str
 		return Date.strptime(str)
@@ -96,7 +92,7 @@ class MysqlBackend < Og::Backend
 	# portable.
 	#
 	# FIXME: add extra handling for float.
-	#
+	
 	def self.write_prop(p)
 		if p.klass.ancestors.include?(Integer)
 			return "#\{@#{p.symbol} || 'NULL'\}"
@@ -109,7 +105,7 @@ class MysqlBackend < Og::Backend
 		elsif p.klass.ancestors.include?(Date)
 			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.date(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(TrueClass)
-			return "#\{@#{p.symbol} || 'NULL'\}"
+			return "#\{@#{p.symbol} ? 1 : 0 \}"
 		else 
 			return %|#\{@#{p.symbol} ? "'#\{Og::MysqlBackend.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
@@ -117,7 +113,7 @@ class MysqlBackend < Og::Backend
 
 	# Return an evaluator for reading the property.
 	# No need to optimize this, used only to precalculate code.
-	#
+	
 	def self.read_prop(p, idx)
 		if p.klass.ancestors.include?(Integer)
 			return "res[#{idx}].to_i()"
@@ -130,7 +126,7 @@ class MysqlBackend < Og::Backend
 		elsif p.klass.ancestors.include?(Date)
 			return "Og::MysqlBackend.parse_date(res[#{idx}])"
 		elsif p.klass.ancestors.include?(TrueClass)
-			return "('true' == res[#{idx}])"
+			return "('0' != res[#{idx}])"
 		else 
 			return "YAML::load(res[#{idx}])"
 		end				
@@ -139,14 +135,14 @@ class MysqlBackend < Og::Backend
 	# Returns the props that will be included in the insert query.
 	# The oid property is rejected because it is mapped to an 
 	# AUTO_INCREMENT column.
-	#
+	
 	def self.props_for_insert(klass)
 		klass.__props.reject { |p| :oid == p.symbol }
 	end
 
-		# Returns the code that actually inserts the object into the
+	# Returns the code that actually inserts the object into the
 	# database. Returns the code as String.
-	#
+	
 	def self.insert_code(klass, sql, pre_cb, post_cb)
 		%{
 			#{pre_cb}
@@ -158,7 +154,7 @@ class MysqlBackend < Og::Backend
 
 	# generate the mapping of the database fields to the
 	# object properties.
-	#
+	
 	def self.calc_field_index(klass, og)
 		res = og.query "SELECT * FROM #{klass::DBTABLE} LIMIT 1"
 		meta = og.managed_classes[klass]
@@ -168,8 +164,8 @@ class MysqlBackend < Og::Backend
 		end
 	end
 	
-	# Generate the property for oid
-	#
+	# Generate the property for oid.
+	
 	def self.eval_og_oid(klass)
 		klass.class_eval %{
 			prop_accessor :oid, Fixnum, :sql => "integer AUTO_INCREMENT PRIMARY KEY"
@@ -181,28 +177,28 @@ class MysqlBackend < Og::Backend
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Create the database.
-	#
+	
 	def self.create_db(database, user = nil, password = nil)
 		Logger.info "Creating database '#{database}'."
 		`mysqladmin -f --user=#{user} --password=#{password} create #{database}`
 	end
 	
 	# Drop the database.
-	#
+	
 	def self.drop_db(database, user = nil, password = nil)
 		Logger.info "Dropping database '#{database}'."
 		`mysqladmin -f --user=#{user} --password=#{password} drop #{database}`
 	end
 
 	# Execute an SQL query and return the result 
-	#
+	
 	def query(sql)
 		Logger.debug sql if $DBG
 		return @conn.query(sql)
 	end
 	
 	# Execute an SQL query, no result returned.
-	#
+	
 	def exec(sql)
 		Logger.debug sql if $DBG
 		@conn.query(sql)
@@ -210,7 +206,7 @@ class MysqlBackend < Og::Backend
 
 	# Execute an SQL query and return the result. Wrapped in a rescue
 	# block.
-	#
+	
 	def safe_query(sql)
 		Logger.debug sql if $DBG
 		begin
@@ -224,7 +220,7 @@ class MysqlBackend < Og::Backend
 	
 	# Execute an SQL query, no result returned. Wrapped in a rescue 
 	# block.
-	#
+	
 	def safe_exec(sql)
 		Logger.debug sql if $DBG
 		begin
@@ -236,25 +232,25 @@ class MysqlBackend < Og::Backend
 	end
 	
 	# Check if it is a valid resultset.
-	#
+	
 	def valid?(res)
 		return !(res.nil? or 0 == res.num_rows)
 	end
 	
 	# Start a new transaction.
-	#
+	
 	def start
 		# no transaction support
 	end
 	
 	# Commit a transaction.
-	#
+	
 	def commit
 		# no transaction support
 	end
 	
 	# Rollback transaction.
-	#
+	
 	def rollback
 		# no transaction support
 	end	
@@ -262,7 +258,7 @@ class MysqlBackend < Og::Backend
 	# Create the managed object table. The properties of the
 	# object are mapped to the table columns. Additional sql relations
 	# and constrains are created (indicices, sequences, etc).
-	#
+	
 	def create_table(klass)
 		fields = create_fields(klass, TYPEMAP)
 
@@ -328,7 +324,7 @@ class MysqlBackend < Og::Backend
 	end
 
 	# Deserialize one row of the resultset.
-	#
+	
 	def deserialize_one(res, klass)	
 		return nil unless valid?(res)
 		
@@ -343,9 +339,9 @@ class MysqlBackend < Og::Backend
 	end
 	
 	# Deserialize all rows of the resultset.
-	#
+	
 	def deserialize_all(res, klass)	
-		return nil unless valid?(res)
+		return [] unless valid?(res)
 
 		entities = []
 
@@ -364,11 +360,11 @@ class MysqlBackend < Og::Backend
 	end
 
 	# Return a single integer value from the resultset.
-	#
+	
 	def get_int(res, idx = 0)	
 		return res.fetch_row[idx].to_i
 	end
 	
 end
 
-end # module
+end

data/lib/og/backends/psql.rb

@@ -1,8 +1,6 @@
-# code: 
 # * George Moschovitis  <gm@navel.gr>
-#
-# (c) 2004 Navel, all rights reserved.
-# $Id: psql.rb 194 2004-12-20 20:23:57Z gmosx $
+# (c) 2004-2005 Navel, all rights reserved.
+# $Id: psql.rb 248 2005-01-31 13:38:34Z gmosx $
 
 require 'postgres'
 
@@ -10,16 +8,14 @@ require 'og/backend'
 
 class Og
 
-# = PsqlBackend
-#
 # Implements a PostgreSQL powered backend.
 # This backend is compatible with Michael Neumann's postgres-pr
 # pure ruby driver.
-#
+
 class PsqlBackend < Og::Backend
 
 	# A mapping between Ruby and SQL types.
-	#
+	
 	TYPEMAP = {
 		Integer => 'integer',
 		Fixnum => 'integer',
@@ -34,7 +30,7 @@ class PsqlBackend < Og::Backend
 	}
 	
 	# Intitialize the connection to the RDBMS.
-	# 		
+	 		
 	def initialize(config)
 		begin
 			@conn = PGconn.connect(nil, nil, nil, nil, config[:database], 
@@ -55,7 +51,7 @@ class PsqlBackend < Og::Backend
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Escape an SQL string
-	#
+	
 	def self.escape(str)
 		return nil unless str
 		return PGconn.escape(str)
@@ -63,7 +59,7 @@ class PsqlBackend < Og::Backend
 
 	# Convert a ruby time to an sql timestamp.
 	# TODO: Optimize this
-	# 
+	 
 	def self.timestamp(time = Time.now)
 		return nil unless time
 		return time.strftime("%Y-%m-%d %H:%M:%S")
@@ -71,7 +67,7 @@ class PsqlBackend < Og::Backend
 	
 	# Output YYY-mm-dd
 	# TODO: Optimize this
-	#
+	
 	def self.date(date)
 		return nil unless date
 		return "#{date.year}-#{date.month}-#{date.mday}" 
@@ -79,14 +75,14 @@ class PsqlBackend < Og::Backend
 	
 	# Parse sql datetime
 	# TODO: Optimize this
-	#
+	
 	def self.parse_timestamp(str)
 		return Time.parse(str)		
 	end
 	
 	# Input YYYY-mm-dd
 	# TODO: Optimize this
-	#
+	
 	def self.parse_date(str)
 		return nil unless str
 		return Date.strptime(str)
@@ -98,7 +94,7 @@ class PsqlBackend < Og::Backend
 	# portable.
 	#
 	# FIXME: add extra handling for float.
-	#
+	
 	def self.write_prop(p)
 		if p.klass.ancestors.include?(Integer)
 			return "#\{@#{p.symbol} || 'NULL'\}"
@@ -111,7 +107,7 @@ class PsqlBackend < Og::Backend
 		elsif p.klass.ancestors.include?(Date)
 			return %|#\{@#{p.symbol} ? "'#\{Og::PsqlBackend.date(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(TrueClass)
-			return "#\{@#{p.symbol} || 'NULL'\}"
+			return "#\{@#{p.symbol} ? \"'t'\" : 'NULL' \}"
 		else 
 			return %|#\{@#{p.symbol} ? "'#\{Og::PsqlBackend.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
@@ -119,7 +115,7 @@ class PsqlBackend < Og::Backend
 
 	# Return an evaluator for reading the property.
 	# No need to optimize this, used only to precalculate code.
-	#
+	
 	def self.read_prop(p, idx)
 		if p.klass.ancestors.include?(Integer)
 			return "res.getvalue(tuple, #{idx}).to_i()"
@@ -132,7 +128,7 @@ class PsqlBackend < Og::Backend
 		elsif p.klass.ancestors.include?(Date)
 			return "Og::PsqlBackend.parse_date(res.getvalue(tuple, #{idx}))"
 		elsif p.klass.ancestors.include?(TrueClass)
-			return "('true' == res.getvalue(tuple, #{idx}))"
+			return %|('t' == res.getvalue(tuple, #{idx}))|
 		else 
 			return "YAML::load(res.getvalue(tuple, #{idx}))"
 		end		
@@ -140,7 +136,7 @@ class PsqlBackend < Og::Backend
 
 	# Returns the code that actually inserts the object into the
 	# database. Returns the code as String.
-	#
+	
 	def self.insert_code(klass, sql, pre_cb, post_cb)
 		%{
 			#{pre_cb}
@@ -153,7 +149,7 @@ class PsqlBackend < Og::Backend
 
 	# generate the mapping of the database fields to the
 	# object properties.
-	#
+	
 	def self.calc_field_index(klass, og)
 		res = og.query "SELECT * FROM #{klass::DBTABLE} LIMIT 1"
 		meta = og.managed_classes[klass]
@@ -164,7 +160,7 @@ class PsqlBackend < Og::Backend
 	end
 	
 	# Generate the property for oid
-	#
+	
 	def self.eval_og_oid(klass)
 		klass.class_eval %{
 			prop_accessor :oid, Fixnum, :sql => "integer PRIMARY KEY"
@@ -176,28 +172,28 @@ class PsqlBackend < Og::Backend
 	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 	# Create the database.
-	#
+	
 	def self.create_db(database, user = nil, password = nil)
 		Logger.info "Creating database '#{database}'."
 		`createdb #{database} -U #{user}`
 	end
 	
 	# Drop the database.
-	#
+	
 	def self.drop_db(database, user = nil, password = nil)
 		Logger.info "Dropping database '#{database}'."
 		`dropdb #{database} -U #{user}`
 	end
 	
-	# Execute an SQL query and return the result 
-	#
+	# Execute an SQL query and return the result.
+	
 	def query(sql)
 		Logger.debug sql if $DBG
 		return @conn.exec(sql)
 	end
 	
 	# Execute an SQL query, no result returned.
-	#
+	
 	def exec(sql)
 		Logger.debug sql if $DBG
 		res = @conn.exec(sql)
@@ -206,7 +202,7 @@ class PsqlBackend < Og::Backend
 
 	# Execute an SQL query and return the result. Wrapped in a rescue
 	# block.
-	#
+	
 	def safe_query(sql)
 		Logger.debug sql if $DBG
 		begin
@@ -220,7 +216,7 @@ class PsqlBackend < Og::Backend
 
 	# Execute an SQL query, no result returned. Wrapped in a rescue 
 	# block.
-	#
+	
 	def safe_exec(sql)
 		Logger.debug sql if $DBG
 		begin
@@ -233,7 +229,7 @@ class PsqlBackend < Og::Backend
 	end
 
 	# Check if it is a valid resultset.
-	#
+	
 	def valid?(res)
 		return !(res.nil? or 0 == res.num_tuples)
 	end
@@ -241,7 +237,7 @@ class PsqlBackend < Og::Backend
 	# Create the managed object table. The properties of the
 	# object are mapped to the table columns. Additional sql relations
 	# and constrains are created (indicices, sequences, etc).
-	#
+	
 	def create_table(klass)
 		fields = create_fields(klass, TYPEMAP)
 
@@ -282,6 +278,7 @@ class PsqlBackend < Og::Backend
 		# create the sequence for this table. Even if the table
 		# uses the oids_seq, attempt to create it. This makes
 		# the system more fault tolerant.
+
 		begin
 			exec "CREATE SEQUENCE #{klass::DBSEQ}"
 			Logger.info "Created sequence '#{klass::DBSEQ}'."	
@@ -336,15 +333,15 @@ class PsqlBackend < Og::Backend
 		
 	end
 	
-	# Drop the managed object table
-	#
+	# Drop the managed object table.
+	
 	def drop_table(klass)
 		super
 		exec "DROP SEQUENCE #{klass::DBSEQ}"		
 	end
 
 	# Deserialize one row of the resultset.
-	#
+	
 	def deserialize_one(res, klass)	
 		return nil unless valid?(res)
 		
@@ -359,9 +356,9 @@ class PsqlBackend < Og::Backend
 	end
 	
 	# Deserialize all rows of the resultset.
-	#
+	
 	def deserialize_all(res, klass)	
-		return nil unless valid?(res)
+		return [] unless valid?(res)
 
 		entities = []
 	
@@ -379,11 +376,11 @@ class PsqlBackend < Og::Backend
 	end
 
 	# Return a single integer value from the resultset.
-	#
+	
 	def get_int(res, idx = 0)	
 		return res.getvalue(0, idx).to_i
 	end
 
 end
 
-end # module
+end