lafcadio 0.9.3 → 0.9.4

data/lib/lafcadio.rb

@@ -16,7 +16,7 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.9.3"
+	Version = "0.9.4"
 
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'

data/lib/lafcadio.rb~

@@ -1,5 +1,5 @@
-# Lafcadio is an object-relational mapping library for Ruby and MySQL. Its
-# design has a few aspects in mind:
+# Lafcadio is an object-relational mapping library for Ruby. It currently
+# supports MySQL and PostgreSQL. Its design has a few aspects in mind:
 # * The importance of unit-testing. Lafcadio includes a MockObjectStore which
 #   can take the place of the ObjectStore for unit tests, so you can test
 #   complex database-driven logic. Committing domain objects, running queries,
@@ -16,7 +16,7 @@
 # http://lafcadio.rubyforge.org/tutorial.html.
 
 module Lafcadio
-	Version = "0.9.2"
+	Version = "0.9.3"
 
 	require 'lafcadio/depend'
 	require 'lafcadio/domain'

data/lib/lafcadio/domain.rb

@@ -645,7 +645,6 @@ module Lafcadio
 		end
 
 		def self.try_load_xml_parser # :nodoc:
-			require 'lafcadio/domain'
 			if ( dirName = LafcadioConfig.new['classDefinitionDir'] )
 				xmlFileName = self.basename + '.xml'
 				xmlPath = File.join( dirName, xmlFileName )

data/lib/lafcadio/domain.rb~

@@ -1,6 +1,7 @@
 require 'extensions/module'
 require 'lafcadio/objectField'
 require 'lafcadio/util'
+require 'monitor'
 require 'rexml/document'
 
 module Lafcadio
@@ -277,6 +278,7 @@ module Lafcadio
 	# different levels.
 	class DomainObject
 		@@subclass_records = Hash.new do |h, k| h[k] = SubclassRecord.new( k ); end
+		@@subclass_records.extend MonitorMixin
 
 		include DomainComparable
 		
@@ -603,7 +605,7 @@ module Lafcadio
 		end
 		
 		def self.subclass_record # :nodoc:
-			@@subclass_records[self]
+			@@subclass_records.synchronize { @@subclass_records[self] }
 		end
 
 		def self.subclasses #:nodoc:

data/lib/lafcadio/objectStore.rb

@@ -562,6 +562,7 @@ module Lafcadio
 					db_object
 				)
 				statements_and_binds.each do |sql, binds|
+					maybe_log sql
 					@db_conn.do( sql, *binds )
 				end
 				if statements_and_binds[0].first =~ /insert/
@@ -596,13 +597,15 @@ module Lafcadio
 				config = LafcadioConfig.new
 				if config['logSql'] == 'y'
 					sqllog = Log4r::Logger['sql'] || Log4r::Logger.new( 'sql' )
-					filename = File.join(
-						config['logdir'], config['sqlLogFile'] || 'sql'
-					)
-					outputter = Log4r::FileOutputter.new(
-						'outputter', { :filename => filename }
-					)
-					sqllog.outputters = outputter
+					if sqllog.outputters.empty?
+						filename = File.join(
+							config['logdir'], config['sqlLogFile'] || 'sql'
+						)
+						outputter = Log4r::FileOutputter.new(
+							'outputter', { :filename => filename }
+						)
+						sqllog.outputters = outputter
+					end
 					sqllog.info sql
 				end
 			end

data/lib/lafcadio/objectStore.rb~

@@ -575,7 +575,15 @@ module Lafcadio
 			def get_last_pk_id_inserted( domain_class )
 				pair = self.class.last_inserted_pk_id_pair( domain_class )
 				sql = 'select ' + pair.first
-				select_all( sql ).first[pair.last].to_i
+				begin
+					select_all( sql ).first[pair.last].to_i
+				rescue RuntimeError
+					error_msg =
+							"The field \"" + domain_class.sql_primary_key_name +
+							"\" can\'t be found in the table \"" + 
+							domain_class.table_name + "\"."
+					raise FieldMatchError, error_msg, caller
+				end
 			end
 			
 			def group_query( query )
@@ -610,7 +618,7 @@ module Lafcadio
 			
 			def select_dobjs(query)
 				domain_class = query.domain_class
-				select_all( query.to_sql ).collect { |row_hash|
+				select_all( query.to_sql( ObjectStore.db_type ) ).collect { |row_hash|
 					dobj = domain_class.new(
 						SqlToRubyValues.new( domain_class, row_hash )
 					)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: lafcadio
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2006-03-21 00:00:00 -08:00
+  version: 0.9.4
+date: 2006-05-01 00:00:00 -04:00
 summary: Lafcadio is an object-relational mapping layer
 require_paths: 
 - lib
@@ -15,7 +15,7 @@ description: Lafcadio is an object-relational mapping layer for Ruby. It lets yo
 autorequire: lafcadio
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -52,8 +52,9 @@ files:
 - lib/lafcadio/test/testconfig.dat
 test_files: []
 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- lib/lafcadio.rb
 extra_rdoc_files: []
 
 executables: