og 0.17.0 → 0.18.0

data/lib/og/store/kirby/readme.txt

@@ -0,0 +1,63 @@
+KirbyBase 2.2
+
+A small, plain-text, dbms written in Ruby.  It can be used either embedded 
+or client/server.  Version 2 is a complete re-write with a completely new
+interface.  It is NOT backwards compatible.  If you need backwards
+compatibility, please use version 1.6.
+
+
+*Installation:
+
+Unpack the file you downloaded.  Execute "ruby install.rb" or simply make 
+sure kirbybase.rb is somewhere in your Ruby library path.
+
+
+*Documentation:
+
+Documentation is in manual.html.  Also, RDoc generated documentation is in 
+the doc directory.
+
+See kbtest.rb for examples of how to use KirbyBase.
+
+
+*Manifest:
+
+readme.txt - this file
+install.rb - install script
+changes.txt - history of changes.
+manual.html - documentation
+kirbybase.rb - dbms library
+kbserver.rb - multi-threaded database server script.
+kbtest.rb - test script with examples.
+record_class_test.rb - script showing how to have KB return class instances.
+csv_import_test.rb - script showing how to have KB import a csv file.
+plane.csv - sample csv file used in csv_import_test.rb
+doc directory - RDoc generated documentation in html format.
+
+
+*License:
+
+KirbyBase is distributed under the same license as Ruby.
+
+
+*Warranty:
+
+I should probably put something more legalese here but let me just say:
+
+KirbyBase carries no warranty!  Use at your own risk.  If it eats your
+data, please don't come after me.  :)
+
+
+That being said, please send any bug reports, suggestions, ideas,
+improvements, to:
+
+jcribbs@twmi.rr.com
+
+You can find more info about KirbyBase at:
+
+http://www.netpromi.com/kirbybase.html
+
+
+Thanks for trying KirbyBase.
+
+Jamey Cribbs

data/lib/og/store/madeleine.rb

@@ -1,4 +1,2 @@
-# $Id$
-
 module Og
 end

data/lib/og/store/mysql.rb

@@ -152,9 +152,9 @@ class MysqlStore < SqlStore
 private
 
 	def create_table(klass)
-		columns = columns_for_class(klass)
+		fields = fields_for_class(klass)
 
-		sql = "CREATE TABLE #{klass::OGTABLE} (#{columns.join(', ')}"
+		sql = "CREATE TABLE #{klass::OGTABLE} (#{fields.join(', ')}"
 		
 		# Create table constrains.
 		
@@ -210,7 +210,7 @@ private
 		end
 	end
 
-	def create_column_map(klass)
+	def create_field_map(klass)
 		conn.query_with_result = true
 		res = @conn.query "SELECT * FROM #{klass::OGTABLE} LIMIT 1"
 		map = {}
@@ -245,9 +245,9 @@ private
 	
 	def read_prop(p, col)
 		if p.klass.ancestors.include?(Integer)
-			return "res[#{col} + offset].to_i"
+			return "#{self.class}.parse_int(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(Float)
-			return "res[#{col} + offset].to_f"
+			return "#{self.class}.parse_float(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(String)
 			return "res[#{col} + offset]"
 		elsif p.klass.ancestors.include?(Time)

data/lib/og/store/psql.rb

@@ -79,6 +79,14 @@ class PsqlStore < SqlStore
 			options[:user].to_s, 
 			options[:password].to_s
 		)
+		
+		schema_order = options[:schema_order]
+		encoding = options[:encoding]
+		min_messages = options[:min_messages]
+		
+		@conn.exec("SET search_path TO #{schema_order}") if schema_order
+    @conn.exec("SET client_encoding TO '#{encoding}'") if encoding
+    @conn.exec("SET client_min_messages TO '#{min_messages}'") if min_messages
 	rescue => ex
 		# gmosx: any idea how to better test this?
 		if ex.to_s =~ /database .* does not exist/i
@@ -117,9 +125,9 @@ class PsqlStore < SqlStore
 private
 
 	def create_table(klass)
-		columns = columns_for_class(klass)
+		fields = fields_for_class(klass)
 
-		sql = "CREATE TABLE #{klass::OGTABLE} (#{columns.join(', ')}"
+		sql = "CREATE TABLE #{klass::OGTABLE} (#{fields.join(', ')}"
 		
 		# Create table constrains.
 		
@@ -180,12 +188,12 @@ private
 		exec "DROP SEQUENCE #{klass::OGSEQ}"		
 	end
 
-	def create_column_map(klass)
+	def create_field_map(klass)
 		res = @conn.exec "SELECT * FROM #{klass::OGTABLE} LIMIT 1"
 		map = {}
 	
-		for column in res.fields
-			map[column.intern] = res.fieldnum(column)
+		for field in res.fields
+			map[field.intern] = res.fieldnum(field)
 		end
 	
 		return map
@@ -195,9 +203,9 @@ private
 
 	def read_prop(p, col)
 		if p.klass.ancestors.include?(Integer)
-			return "res.getvalue(row, #{col} + offset).to_i"
+			return "#{self.class}.parse_int(res.getvalue(row, #{col} + offset))"
 		elsif p.klass.ancestors.include?(Float)
-			return "res.getvalue(row, #{col} + offset).to_f"
+			return "#{self.class}.parse_float(res.getvalue(row, #{col} + offset))"
 		elsif p.klass.ancestors.include?(String)
 			return "res.getvalue(row, #{col} + offset)"
 		elsif p.klass.ancestors.include?(Time)

data/lib/og/store/sql.rb

@@ -30,6 +30,20 @@ module SqlUtils
 		return nil unless date
 		return "#{date.year}-#{date.month}-#{date.mday}" 
 	end
+
+	# Parse an integer.
+	
+	def parse_int(int)
+		int = int.to_i if int
+		int
+	end
+	
+	# Parse a float.
+	
+	def parse_float(fl)
+		fl = fl.to_f if fl
+		fl
+	end
 	
 	# Parse sql datetime
 	#--
@@ -246,7 +260,18 @@ class SqlStore < Store
 		
 		exec "INSERT INTO #{table} (key1, key2) VALUES (#{obj1.pk}, #{obj2.pk})"
 	end 
-	
+
+	# Unrelate two objects be removing their relation from the
+	# join table.
+		
+	def unjoin(obj1, obj2, table)
+		if obj1.class.to_s > obj2.class.to_s
+			obj1, obj2 = obj2, obj1
+		end	
+
+		exec "DELETE FROM #{table} WHERE key1=#{obj1.pk} AND key2=#{obj2.pk}"
+	end
+		
 	# :section: Transaction methods.
 	
 	# Start a new transaction.
@@ -280,42 +305,42 @@ private
 		exec "DROP TABLE #{klass.table}"
 	end
 
-	# Create the columns that correpsond to the klass properties.
-	# The generated columns array is used in create_table.
+	# Create the fields that correpsond to the klass properties.
+	# The generated fields array is used in create_table.
 	# If the property has an :sql metadata this overrides the 
 	# default mapping. If the property has an :extra_sql metadata 
 	# the extra sql is appended after the default mapping.
 	
-	def columns_for_class(klass)
-		columns = []
+	def fields_for_class(klass)
+		fields = []
 	
-		klass.__props.each do |p|
+		klass.properties.each do |p|
 			klass.index(p.symbol) if p.meta[:index]
 				
-			column = p.symbol.to_s
+			field = p.symbol.to_s
 			
 			if p.meta and p.meta[:sql]
-				column << " #{p.meta[:sql]}"
+				field << " #{p.meta[:sql]}"
 			else
-				column << " #{type_for_class(p.klass)}"
+				field << " #{type_for_class(p.klass)}"
 				
 				if p.meta
 					if default = p.meta[:default]
-						column << " DEFAULT #{default.inspect} NOT NULL"
+						field << " DEFAULT #{default.inspect} NOT NULL"
 					end
 				
-					column << " UNIQUE" if p.meta[:unique]
+					field << " UNIQUE" if p.meta[:unique]
 
 					if extra_sql = p.meta[:extra_sql]
-						column << " #{extra_sql}"
+						field << " #{extra_sql}"
 					end
 				end
 			end
 			
-			columns << column
+			fields << field
 		end
 
-		return columns
+		return fields
 	end
 
 	def type_for_class(klass)
@@ -354,9 +379,9 @@ private
 	
 	def read_prop(p, col)
 		if p.klass.ancestors.include?(Integer)
-			return "res[#{col} + offset].to_i"
+			return "#{self.class}.parse_int(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(Float)
-			return "res[#{col} + offset].to_f"
+			return "#{self.class}.parse_float(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(String)
 			return "res[#{col} + offset]"
 		elsif p.klass.ancestors.include?(Time)
@@ -413,16 +438,16 @@ private
 
 	# Compile the og_read method for the class. This method is 
 	# used to read (deserialize) the  given class from the store. 
-	# In order to allow for changing column/attribute orders a 
-	# column mapping hash is used.
+	# In order to allow for changing field/attribute orders a 
+	# field mapping hash is used.
 	
 	def eval_og_read(klass)
 		code = []
 		props = klass.properties 
-		column_map = create_column_map(klass)
+		field_map = create_field_map(klass)
 
 		props.each do |p|
-			if col = column_map[p.symbol]
+			if col = field_map[p.symbol]
 				code << "@#{p.symbol} = #{read_prop(p, col)}"
 			end
 		end
@@ -487,7 +512,7 @@ private
 				end
 			end
 
-			columns = tables.collect { |t| "#{t}.*" }.join(',')
+			fields = tables.collect { |t| "#{t}.*" }.join(',')
 
 			if options[:condition]
 				options[:condition] +=  " AND #{join_conditions.join(' AND ')}"
@@ -495,7 +520,7 @@ private
 				options[:condition] = join_conditions.join(' AND ')
 			end
 		else
-			columns = '*'
+			fields = '*'
 		end
 
 		if join_table = options[:join_table]
@@ -507,7 +532,7 @@ private
 			end
 		end
 
-		sql = "SELECT #{columns} FROM #{tables.join(',')}"
+		sql = "SELECT #{fields} FROM #{tables.join(',')}"
 		
 		if condition = options[:condition] || options[:where]
 			sql << " WHERE #{condition}"
@@ -597,3 +622,5 @@ private
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/og/store/sqlite.rb

@@ -9,13 +9,11 @@ require 'fileutils'
 
 require 'og/store/sql'
 
-# Customize the standard postgres resultset to make
+# Customize the standard Sqlite3 resultset to make
 # more compatible with Og.
 
 class SQLite3::ResultSet
-	def blank?
-		false
-	end
+	alias_method :blank?, :eof?
 	
 	def each_row
 		each do |row|
@@ -38,9 +36,15 @@ module Og
 
 class SqliteStore < SqlStore
 
+	# Override if needed.
+	
+	def self.db_filename(options)
+		"#{options[:name]}.db"
+	end
+	
 	def self.destroy(options)
 		begin
-			FileUtils.rm("#{options[:name]}.db")	
+			FileUtils.rm(db_filename(options))	
 			super
 		rescue Object
 			Logger.info "Cannot drop '#{options[:name]}'!"
@@ -49,7 +53,7 @@ class SqliteStore < SqlStore
 
 	def initialize(options)
 		super
-		@conn = SQLite3::Database.new("#{options[:name]}.db")
+		@conn = SQLite3::Database.new(self.class.db_filename(options))
 	end
 
 	def close
@@ -95,9 +99,9 @@ class SqliteStore < SqlStore
 private
 
 	def create_table(klass)
-		columns = columns_for_class(klass)
+		fields = fields_for_class(klass)
 
-		sql = "CREATE TABLE #{klass::OGTABLE} (#{columns.join(', ')}"
+		sql = "CREATE TABLE #{klass::OGTABLE} (#{fields.join(', ')}"
 		
 		# Create table constrains.
 		
@@ -153,14 +157,14 @@ private
 		end
 	end
 
-	def create_column_map(klass)
+	def create_field_map(klass)
 		res = @conn.query "SELECT * FROM #{klass::OGTABLE} LIMIT 1"
 		map = {}
 		
-		columns = res.columns
+		fields = res.fields
 
-		columns.size.times do |i|
-			map[columns[i].intern] = i
+		fields.size.times do |i|
+			map[fields[i].intern] = i
 		end
 	
 		return map

data/lib/og/store/sqlserver.rb

@@ -1,3 +1,7 @@
+# WARNING: 
+# This store is not converted to the latest Og codebase.
+# DO NOT USE YET!
+
 begin
 	require 'dbi'
 rescue Object => ex
@@ -121,9 +125,9 @@ class SqlserverStore < SqlStore
 private
 
 	def create_table(klass)
-		columns = columns_for_class(klass)
+		fields = fields_for_class(klass)
 
-		sql = "CREATE TABLE #{klass::OGTABLE} (#{columns.join(', ')}"
+		sql = "CREATE TABLE #{klass::OGTABLE} (#{fields.join(', ')}"
 		
 		# Create table constrains.
 		
@@ -189,7 +193,7 @@ private
 =end
 	end
 
-	def create_column_map(klass)
+	def create_field_map(klass)
 		conn.query_with_result = true
 		res = @conn.query "SELECT * FROM #{klass::OGTABLE} LIMIT 1"
 		map = {}

data/test/og/tc_store.rb

@@ -64,20 +64,33 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 		@og.store.class.destroy(@og.options)
 		@og = nil
 	end
-	
+
 =begin
+	def test_kirby
+		@og = Og.setup(
+			:destroy => true,
+			:store => :kirby,
+			:name => 'test',
+			:embedded => true
+		)
+		features_test
+#		conversions_test
+	end
+=end
+#=begin	
 	def test_psql
 		@og = Og.setup(
 			:destroy => true,
 			:store => :psql,
 			:name => 'test',
+			:min_messages => 'ERROR',
 			:user => 'postgres',
 			:password => 'navelrulez'
 		)
 		features_test
 		conversions_test
 	end
-=end
+#=end
 =begin
 	def test_mysql
 		@og = Og.setup(
@@ -91,7 +104,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 #		conversions_test
 	end
 =end
-#=begin
+=begin
 	def test_sqlite
 		@og = Og.setup(
 			:destroy => true,
@@ -101,7 +114,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 		features_test
 		conversions_test
 	end
-#=end
+=end
 =begin
 	def test_memory
 		@og = Og.setup(
@@ -134,7 +147,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 		@og.store.delete(a3)
 
 		assert @og.store.load(1, Article)
-#		assert !Article[2]
+		assert !Article[2]
 		assert Article.load(1)
 
 		a2.delete
@@ -220,7 +233,7 @@ class TCOgStore < Test::Unit::TestCase # :nodoc: all
 
 		assert_equal 3, @og.store.count(:class => Comment)
 
-		a4.comments.clear
+		a4.comments.delete_all
 		assert_equal 0, a4.comments.size
 
 		# has_one