kansas 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 63cde5e095dfff7d050db228382340f5e55e58f4
+  data.tar.gz: 98282e840a73eeddad1968cbb661aa0ae4459640
+SHA512:
+  metadata.gz: 8b198c707bca9ff84f8a4b8fbb576f7a55f94031c2fd10695e5def07192dd66623df6a7afc171fc3fbbc6460457e9d344e1c01a30c0bcfdc7c0882275e2559b8
+  data.tar.gz: ca59bd739d3d4b8fb98e89b8a837486f223155b71211ef33b2fd9a612575a124324001bdae6abd124e7890c4828a7a6b974cab689d8c372950af2f79054b9bee

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in kansas.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Kirk Haines
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,97 @@
+# Kansas
+
+Kansas is an object-releational mapping library for Ruby. It has been around and in use since 2004 in many production projects, but has received very little open source exposure in that time, being used almost exclusively in closed source commercial projects.
+
+Kansas's original design leveraged DBI, and provided an ORM mapping with a ruby based query syntax.
+
+I am putting it on github, and starting the repo with a version of kansas from circa 2006-2007ish times. It will then be updated with a somewhat newer version that implements a few minor changes. The library will be converted to a modern Ruby packaging structure, and modernized.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'kansas'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install kansas
+
+## Usage
+
+```ruby
+ksdbh = KSDatabase.new("dbi:Mysql:DBNAME:DBHOST", USERNAME, PASSWORD)
+ksdbh.map_all_tables
+```
+
+```ruby
+# Equivalent to:
+#     select * from table_as_classname
+all_rows = ksdbh.select(:TableAsClassname)
+```
+
+```ruby
+# Equivalent to:
+#     select * from table_as_classname where field = "blah"
+some_rows = ksdbh.select(:TableAsClassname) {|t| t.field == "blah"}
+```
+
+```ruby
+# Equivalent to:
+#     select * from table table_as_classname where field = "blah" and field2 > 100 and field3 between(3,6)
+some_rows = ksdbh.select(:TableAsClassname) {|t| ( t.field == "blah" ) & ( t.field2 > 100 ) & (t.field3.between(3,6) }
+```
+
+```ruby
+first_record = some_rows.first
+# Unless autocommit is set to false, this will update the database synchronously
+first_record.field4 = "more stuff"
+```
+
+```ruby
+# Implied transactions
+ksdbh.autcommit = false
+first_record.field = "bleargh"
+first_record.field2 = 1000
+$ksdbh.commit # use ksdbh.rollback to revert the changes, instead
+```
+
+```ruby
+# Explicit transitions via a block
+ksdbh.transaction do
+  first_record.field3 = "xyzzy"
+  first_record.field4 = do_calculation
+
+  if first_record.field4 < 100
+    ksdbh.rollback
+  else
+    ksdbh.commit
+  end
+end
+```
+
+```ruby
+# Delete a record
+first_record.delete
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/wyhaines/kansas. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -0,0 +1,11 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+puts "TESTING: #{FileList['test/**/*_test.rb'].inspect}"
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "kansas"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/kansas.gemspec

@@ -0,0 +1,35 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'kansas/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "kansas"
+  spec.version       = Kansas::VERSION
+  spec.authors       = ["Kirk Haines"]
+  spec.email         = ["wyhaines@gmail.com"]
+
+  spec.summary       = %q{Object/Relational mapper with a Ruby based query syntax}
+  spec.description   = %q{Object/Relational mapper with a Ruby based query syntax}
+  spec.homepage      = "https://github.com/wyhaines/kansas"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest"
+  spec.add_runtime_dependency "dbi"
+  spec.add_development_dependency "dbd-mysql" # can be changes to a different db driver, or commented out if not running tests.
+end

data/lib/kansas.rb

@@ -0,0 +1,42 @@
+require 'dbi'
+require 'dbi/sql'
+require 'kansas/patch_dbi'
+require 'kansas/Database'
+require 'kansas/Table'
+require 'kansas/TableClass'
+require 'kansas/ToOne'
+require 'kansas/ToMany'
+require 'kansas/BelongsTo'
+require 'kansas/Expression'
+
+module Kansas
+  def Kansas.log(*args)
+    $stderr.puts(*args)
+  end
+end    
+
+
+module DBI
+	module SQL
+		module BasicQuote
+			class Coerce
+				def as_timestamp(str)
+					return nil if str.nil? or str.empty?
+					ary = ParseDate.parsedate(str)
+					time = nil
+					begin
+						time = ::Time.local(*(ary[0,6]))
+						if m = /^((\+|\-)\d+)(:\d+)?$/.match(ary[6])
+							diff = m[1].to_i * 3600  # seconds per hour
+							time -= diff
+							time.localtime
+						end
+					rescue Exception
+						time = nil
+					end
+					time ? DBI::Timestamp.new(time) : DBI::Timestamp.new(0)
+				end
+			end
+		end
+	end
+end

data/lib/kansas/BelongsTo.rb

@@ -0,0 +1,23 @@
+class KSBelongsTo
+
+	attr_reader :foreignTable, :foreignField, :localTable, :localField
+
+	def initialize(*args)
+		@localTable, @foreignTable, @localField, @foreignField = args
+		@foreignField = @foreignTable.primaries.first unless @foreignField != ''
+	end
+	
+	def get(parent)
+		parent.context.get_object(@foreignTable, [parent.row[@localField]])
+	end
+		
+	def set(parent, child)
+		parent.row[@localField] = child.row[@foreignField]
+		parent.changed
+	end
+	
+	def join
+		"#{@localTable.table_name}.#{@localField} = #{@foreignTable.table_name}.#{@foreignField}"
+	end
+	
+end

data/lib/kansas/Database.rb

@@ -0,0 +1,659 @@
+require 'forwardable'
+
+#####
+# Note: If you are reading the code, be aware that a lot of this is going to 
+#  be changing.  Better exception handling (really, any exception handling
+#  will be better exception handling), better code organization, more comments,
+#  and more consistency in the use of snake_case.
+#  If you want to spend a little time helping out, I welcome patches.
+#  khaines@enigo.com
+#####
+
+#####
+# Note: One fairly highly ranked item on the todo list is to add capability
+#   to join on fields other than primary key fields.  I also want to be able
+#   to define views -- objects that present a joined view of part or all
+#   of two or more tables.  Along with this will probably come the ability,
+#   when mapping a table, to specify specific columns to map or not to
+#   map.
+#####
+
+# Escapes quotes inside of a SQL statement.
+# ToDo:  Make this obsolete by having all SQL statements use bind variables.
+
+def sql_escape(val)
+	"'" + val.to_s.gsub("'", "\\\\'") + "'"
+end
+
+class String
+
+	# Converts a string so that each initial letter after an underscore is
+	# an uppercase letter.
+	
+	def mixcase
+		if self == upcase
+			res = downcase
+		else
+			res = dup
+		end
+   		res.gsub(/_(\w)/) {$1.upcase}
+	end
+	
+end
+
+class KSBadTable < Exception;end
+class KSNoTable < Exception;end
+class KSBadFieldName < Exception;end
+class KSRollback < Exception;end
+class KSNull < NilClass;end
+
+require 'drb'
+
+class KSDatabase
+
+	include DRbUndumped
+
+	extend Forwardable
+	def_delegators('@dbh','connected?','disconnect','do','ping','prepare','execute','select_all','select_one','quote','tables','columns')
+	
+	@@partial_to_complete_map = {}
+	
+	def KSDatabase.partial_to_complete_map
+		@@partial_to_complete_map
+	end
+	
+	attr_reader :options, :tables
+	attr_accessor :dbh
+	
+	# Initialize Kansas.  Kansas optionally accepts a database handle.  This
+	# allows an external system, such as a database connection pool, to be
+	# used with Kansas.
+	
+	def initialize(arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil)
+		# If a database handle is passed in as the first arg, then the second should be an options has.
+		# If the first arg is a string, then it is assumed to be a dsn and the next two args will be
+		# username and password, followed by options.
+		if String === arg1
+			dsn = arg1
+			username = arg2
+			password = arg3
+			options = arg4 ? arg4 : {}
+		else
+			dbh = arg1
+			options = arg2 ? arg2 : {}
+		end
+		
+		if dbh
+			@dbh = dbh
+			@options = options
+		elsif dsn
+			connect_using(dsn,username,password,options)
+			new_dbh
+		else
+			@options = options
+		end
+
+		@objects = {}
+		@changed = []    
+  		@remote_to_local_map = {}
+		set_autocommit
+	end
+	
+	# Set the parameters used for making a DBI connection.
+	
+ 	def connect_using(dsn, user, password, options = {})
+		@dsn = dsn
+		@user = user
+		@password = password
+		@options = options
+	end
+	alias :connectUsing :connect_using
+	
+	def new_dbh
+		@dbh = DBI.connect(@dsn, @user, @password) if @dsn
+	end
+	alias :newDbh :new_dbh
+
+	def query(*args,&blk)
+		error_recovery ||= false
+		yield(@dbh,*args)
+	rescue Exception => e
+		unless error_recovery
+			error_recovery = true
+			new_dbh
+			retry
+		else
+			raise e
+		end
+	end
+
+ 	def autocommit?
+ 		@options[:autocommit]
+ 	end
+  	
+  	def autocommit
+  		autocommit?
+  	end
+  	
+  	def autocommit=(setting)
+  		set_autocommit setting
+  	end
+  	
+  	def set_autocommit(setting = nil)
+  		if setting != nil
+  			@options[:autocommit] = setting ? true : false
+  		else
+  			@options[:autocommit] = true
+  		end
+  	end
+  	alias :setAutocommit :set_autocommit
+  	
+	def has_object?(table, key)
+		if tableHash = @objects[table]
+			tableHash[key]			
+		else
+			@objects[table] = {}
+			nil
+		end
+ 	end
+
+	def get_object(table, key)
+		unless obj = has_object?(table,key)
+			if obj = load_object(table,key,true)
+				obj.set_serialized
+				register_object(obj)
+			end
+		end
+		obj
+	end
+ 
+ 	# Updates the record in the database for the object.
+ 	
+	def store_object(object)
+		#sql = build_update(object) + build_where(object)
+		#query {|dbh| dbh.do(sql)}
+		rs = build_update(object)
+		sql = rs.first + build_where(object)
+		query {|dbh| dbh.do(sql,*rs.last)}
+	end
+
+	def get_table_from_string(table)
+		if KSDatabase.partial_to_complete_map.has_key?(table)
+			table = self.class.const_get KSDatabase.partial_to_complete_map[table]
+		elsif @remote_to_local_map.has_key?(table)
+			table = self.class.const_get @remote_to_local_map[table]
+		else
+			nil
+		end
+	end
+
+	def check_query_args(*args)
+		tables = []
+		read_only = false
+		final_value = args.length > 1 ? args.last : nil
+		sql = ''
+		
+		args.each do |table|
+			if table == :__read_only__
+				read_only = true
+				next
+			end
+			
+			final_flag = (table == final_value)
+			table = table.to_s if table.kind_of?(Symbol)
+			if table.kind_of?(String)
+				tclass = get_table_from_string(table)
+				if tclass
+					table = tclass
+				else
+					if final_flag
+						sql << table
+					else
+						self.map_all_tables
+						table = get_table_from_string(table)
+					end
+				end
+			end
+			tables << table if table
+		end
+		
+		unless sql != ''
+			if tables.length == 0
+				raise KSNoTable, "KSNoTable: No valid tables were found to operate against."
+			else
+				tables.each do |t|
+					unless t.respond_to?(:is_a_kstable?)
+						raise KSBadTable.new,"KSBadTable: #{t} is not a valid table."
+					end
+				end
+			end
+		end	
+
+		[tables,sql,read_only]
+	end
+
+	
+	# Selects from a table.  If a block is given, that block will be used
+	# to construct the SQL statement.  Otherwise, if a SQL statement was
+	# given as the second argument, that statement will be used.  If no
+	# statement was given, the default is to select * from the table provided
+	# as the first argument.  The table can either be specified by passing
+	# the class for the table to use (e.x. KSDatabase::Students), by passing
+	# the remote name (i.e. the name of the actual database table), or by
+	# passing the local name for the table that was given when mapping the
+	# table. Most of the time the local name or the remote name should be
+	# used as it works just as well as the full class name.
+	#
+	# Note that select'd currently operates outside of the local rollback cache.
+	def select(*args)
+		error_recovery ||= false
+		results = []
+		tables,sql,read_only = check_query_args(*args)
+
+		if block_given?
+			context = KSExpression::Context.new(*tables)
+			yield_args = tables.collect {|t| KSTableExpr.new(t,context)}
+			queryExpr = yield *yield_args
+			sql = queryExpr.select_sql
+		elsif sql == ''
+			sql = "SELECT * FROM #{tables.collect {|t| t.table_name}.join(',')}"
+		end
+		
+		Kansas::log("select: '#{sql}'") if $DEBUG
+
+		rawResults = query do |dbh|
+			dbh.select_all(sql) do |row|
+				results << add_object(tables[0].new.load(row.to_h, self, read_only))
+			end
+		end
+
+		results
+	rescue DBI::DatabaseError => e
+		unless error_recovery
+			error_recovery = true
+			new_dbh
+			retry
+		else
+			raise e
+		end
+	end
+	
+	# Return only one value from a query.
+	
+	def select_first(*args,&blk)
+		select(*args) {|*yargs| blk.call(*yargs)}.first
+	end
+	
+	# Returns only a count of the records selected by the query.
+	def count(*args)
+		error_recovery ||= false
+		results = nil
+		tables,sql = check_query_args(*args)
+
+		if block_given?
+			context = KSExpression::Context.new(*tables)
+			yield_args = tables.collect {|t| KSTableExpr.new(t,context)}
+			queryExpr = yield *yield_args
+			sql = queryExpr.count_sql
+		elsif sql == ''
+			sql = "SELECT count(*) FROM #{tables.collect {|t| t.table_name}.join(',')}"
+		end
+		
+		Kansas::log("select: '#{sql}'") if $DEBUG
+
+		rawResults = query do |dbh|
+			dbh.select_all(sql) do |row|
+				results = row[0]
+			end
+		end
+
+		results
+	rescue DBI::DatabaseError => e
+		unless error_recovery
+			error_recovery = true
+			new_dbh
+			retry
+		else
+			raise e
+		end
+	end
+	
+	# A convenience usage of count().  Returns true if the query would return
+	# any number of rows, or false if the query would not return any rows.
+	
+	def exists?(*args,&block)
+		if block
+			0 < count(*args) {|*blockargs| block.call(*blockargs)}
+		else
+			0 < count(*args)
+		end
+	end
+	# Delete removes one or more rows from the database.  It _also_ returns
+	# an array of objects matching the rows deleted.  If Autocommit is not on,
+	# it will return the array of rows that would be deleted _at the time of
+	# the call_ and will defer the actual deletion from the database until a
+	# commit() is invoked.
+	
+	def delete(table, sql=nil)
+		error_recovery ||= false
+		table = table.to_s if table.kind_of?(Symbol)
+		
+		if table.kind_of?(String)
+			if @remote_to_local_map.has_key?(table)
+				table = self.class.const_get @remote_to_local_map[table]
+			elsif KSDatabase.partial_to_complete_map.has_key?(table)
+				table = self.class.const_get KSDatabase.partial_to_complete_map[table]
+			else
+				table = nil
+			end
+		end
+
+		unless Class === table
+			raise KSBadTable,"KSBadTable: #{table} is not a valid table."
+		end
+
+		if block_given?
+			queryExpr = yield KSTableExpr.new(table)
+			select_sql = queryExpr.sql
+			delete_sql = queryExpr.delete_sql
+		elsif sql == nil
+			select_sql = "SELECT * FROM #{table.table_name}"
+			delete_sql = "DELETE FROM #{table.table_name}"
+		end
+
+		Kansas::log("delete: '#{sql}'") if $DEBUG
+
+		results = []
+		rawResults = query do |dbh|
+			dbh.select_all(select_sql) do |row|
+				results.push add_object(table.new.load(row.to_h, self))
+			end
+		end
+		
+		if autocommit?
+			query {|dbh| dbh.do delete_sql}
+		else
+			changed delete_sql
+		end
+		
+		results
+	rescue DBI::DatabaseError => e
+		unless error_recovery
+			error_recovery = true
+			new_dbh
+			retry
+		else
+			raise e
+		end
+	end
+	
+	def delete_one(object)
+		sql = "DELETE FROM #{object.table_name} #{build_where(object)}"
+		result = query {|dbh| dbh.do sql}
+		unregister_object object
+		result
+	end
+		
+	# Use decoupled_object() to create an object that is not yet connected to
+	# a database.
+
+	def decoupled_object(table, rowdata = {})
+		table = table.to_s if table.is_a? Symbol
+		if table.kind_of? String
+			if @remote_to_local_map.has_key?(table)
+				table = self.class.const_get @remote_to_local_map[table]
+			elsif KSDatabase.partial_to_complete_map.has_key?(table)
+				table = self.class.const_get KSDatabase.partial_to_complete_map[table]
+			else
+				table = nil
+			end
+		end
+		
+                rowdata.each do |k,v|
+                        if k.is_a?(Symbol)
+                                rowdata.delete(k)
+                                rowdata[k.to_s] = v
+                        end
+                end
+		table.new.load(rowdata)
+	end
+
+	# Use new_object() to create new records within a table.
+	
+	def new_object(table,rowdata = {})
+		object = decoupled_object(table,rowdata)
+		register_object object
+		object.context = self
+		if autocommit?
+			insert_object object
+			object.set_serialized
+		else
+			changed object
+		end
+		
+		object
+	end
+	alias :newObject :new_object
+	
+	# Take a table object that is not tied to the database and tie it.
+
+	def register_and_insert_object(object)
+		register_object object
+		object.context = self
+		insert_object object
+		object.set_serialized
+		object
+	end
+  	# Block oriented interface to commit/rollback.
+  	  	
+  	def transaction
+  		old_autocommit = autocommit?
+  		old_dbh_autocommit = @dbh['AutoCommit']
+  		set_autocommit false
+  		@dbh['AutoCommit'] = false
+  		@transaction_flag = true
+  		begin
+  			commit
+  			yield self
+   			commit
+  		rescue KSRollback
+  			# We caught a Rollback; this isn't really an error.
+  			@transaction_flag = false
+  			rollback
+  		rescue Exception
+ 			# Something bad happened.
+ 			@transaction_flag = false
+ 			rollback
+ 			raise
+  		end
+  		set_autocommit(old_autocommit)
+  		@dbh['AutoCommit'] = old_dbh_autocommit
+  	end
+  
+	# Commit transaction to the database.
+	
+	def commit
+		query do |dbh|
+			dbh.transaction do
+				@changed.uniq.each do |o|
+					if o.kind_of?(String)
+						query {|innerdbh| innerdbh.do o.to_s}
+					elsif o.pending_deletion?
+						delete_one o
+					elsif o.serialized?
+						store_object o
+					else
+						insert_object o
+					end
+					o.rollback_buffer = []
+				end
+				@changed.clear
+			end
+			dbh.commit
+		end
+	end
+
+	# Rollback uncommitted transactions on an object so that they never get
+	# to the database.
+	
+	def rollback
+		if @transaction_flag
+			raise KSRollback
+		else
+			@changed.uniq.each do |o|
+				next if o.kind_of?(String)
+				o.rollback
+			end
+			@changed.clear
+		end
+		query {|dbh| dbh.rollback}
+	end
+
+	def changed(obj)
+		@changed << obj
+		if autocommit?
+			commit
+		end
+	end
+	
+	def all_tables
+		query do |dbh|
+			dbh.tables.each do |table_name|
+				Kansas.log("Defining table: #{table_name} as #{canonical(table_name)}") if $DEBUG
+				table(canonical(table_name), table_name)
+			end
+		end
+	end
+	alias :map_all_tables :all_tables
+
+	def table(local_name, remote_name=nil)
+		local_name = local_name.to_s
+		remote_name = local_name unless remote_name
+		remote_name = remote_name.to_s
+		
+		old_local_name = local_name
+		local_name  = make_constant_name(local_name)
+		table = Class.new(KSTable)
+		table.const_set('Name', remote_name)
+		table.const_set('Database', self)
+		table.all_fields
+		
+		@remote_to_local_map[remote_name] = local_name
+		KSDatabase.partial_to_complete_map[old_local_name] = local_name
+		addTable(local_name, table)
+	end
+	alias :map_table :table
+
+	private
+
+	def addTable(name, table)
+		self.class.const_set(name, table) unless self.class.const_defined?(name)
+		if defined?(@tables) && @tables
+			@tables[name] = table
+		else
+			@tables = {name => table}
+		end
+	end
+
+	def canonical(table_name)
+		newName = table_name.mixcase
+		make_constant_name(newName)
+	end
+
+	def make_constant_name(name)
+		name = name.dup
+		name[0,1] = name[0,1].upcase
+		name
+	end
+	
+  	# Inserts a new record in the database for the object.
+  	# Because auto increment fields and timestamp fields on MySQL, and
+  	# presumably other field types on other dbs, require that no explicit
+  	# overriding value be inserted into the field, any field that has a nil
+  	# value is omitted from the insert statement.  To explicity place a
+  	# null value in a field when inserting into the database, use
+  	# KSNull as the value of the field.
+	
+	def insert_object(object)
+		unless object.serialized?
+			table = object.class
+			fields = table.fields.values.collect {|f| object.row[f] != nil ? f : nil}.compact
+			sql = "INSERT into #{table.table_name} (#{fields.join(',')}) VALUES ("
+			sql << fields.collect {|f| '?'}.join(',') << ')'
+			query {|dbh| dbh.do(sql,*fields.collect {|f| object.row[f] == KSNull ? nil : object.row[f]})}
+		end
+	end
+	
+	def add_object(object)
+		if cachedObj = has_object?(object.class, object.key)
+			cachedObj.row = object.row
+			cachedObj
+		else
+			object.set_serialized
+			register_object(object)
+		end
+	end
+
+	def register_object(object)
+		key = object.key
+		has_object?(object.class,key)
+		@objects[object.class][key] = object
+	end
+
+	def unregister_object(object)
+		key = object.key
+		@objects[object.class].delete key
+	end
+	
+	def load_object(object, key, tableflag = false)
+		table = tableflag ? object : object.class
+		query = "SELECT * FROM #{table.table_name}" + build_where_from_key(object, key, tableflag)
+		row = nil
+		row = query {|dbh| dbh.select_one(query)}
+		if row
+			table.new.load(row.to_h, self)
+		else
+			nil
+		end
+	end
+  
+	def build_where(object)
+		build_where_from_key(object, object.key)
+	end
+  
+	def build_where_from_key(object, key, tableflag = false)
+		table = tableflag ? object : object.class
+		where = " WHERE "
+		where_ary = []
+		fields = table.primaries
+    
+		fields.each_index do |i|
+			if !tableflag && object.rollback_hash[fields[i]]
+				val = object.rollback_hash[fields[i]].last
+			else
+				val = key[i]
+			end
+			
+			where_ary.push "#{fields[i]} = #{sql_escape(val)}"
+		end
+		where + where_ary.join(' AND ')
+	end
+  
+	def build_update(object)
+		vals = []
+		update = "UPDATE #{object.table_name} SET "
+		object.row.each do |field, val|
+			#update << " #{field} = #{sql_escape(val)},"
+			update << " #{field} = ?,"
+			vals << val
+		end
+		[update.chop!,vals]
+		#update.chop!		
+	end
+
+	def build_select(table, criteria)
+		criteriaString = "WHERE #{criteria}" if criteria
+		"SELECT * FROM #{table.table_name} #{criteriaString}"
+	end
+
+end