dohmysql 0.1.2 → 0.1.3

data/bin/makedb

@@ -5,9 +5,9 @@ require 'doh/mysql/database_creator'
 
 opts = Doh::Options.new(
 {'drop_first' => [false, "-z", "--drop_first", "if true, will drop the database or tables before creating"] \
-,'database' => [Doh::config['primary_database'], "-d", "--database <database>", "name of the source database -- defaults to config['primary_database'], currently '#{Doh::config['primary_database']}'"] \
+,'database' => [Doh::config[:default_database], "-d", "--database <database>", "name of the source database -- defaults to Doh::config[:default_database], currently '#{Doh::config[:default_database]}'"] \
 ,'all' => [false, "-a", "--all", "create all databases"] \
-,'target' => [Doh::config['target_database'], "-g", "--target <database>", "name of the target database -- defaults to same as source"] \
+,'target' => [nil, "-g", "--target <database>", "name of the target database -- defaults to same as source"] \
 ,'tables' => [nil, "-t", "--tables <tables>", "comma-delimited list of tables to create; if specified, no databases are dropped or created"]
 })
 

data/lib/doh/mysql/abstract_row.rb

@@ -1,4 +1,4 @@
-require 'doh/core_ext/class/force_deep_copy'
+require 'doh/core_ext/force_deep_copy'
 
 module DohDb
 
@@ -58,10 +58,6 @@ class AbstractRow
     return val.nil? || (val.respond_to?(:empty?) && val.empty?)
   end
 
-  def record_id
-    get('id')
-  end
-
 protected
   def parse_initialize_args(*args)
     if args.empty?

data/lib/doh/mysql/cache_connector.rb

@@ -1,21 +1,13 @@
-require 'mysql2'
 require 'doh/mysql/handle'
-require 'doh/mysql/typed_row_builder'
-Mysql2::Client.default_query_options[:cast_booleans] = true
 
 module DohDb
 
 class CacheConnector
-  attr_accessor :host, :username, :password, :database, :row_builder, :timeout, :port
-
-  def initialize(host = nil, username = nil, password = nil, database = nil, row_builder = nil)
-    @host = host
-    @username = username
-    @password = password
-    @database = database
-    @timeout = 1800
-    @port = nil
-    @row_builder = row_builder || TypedRowBuilder.new
+  attr_accessor :config
+
+  def initialize(config)
+    @config = config
+    @config[:timeout] ||= 1800
   end
 
   def request_handle(database = nil)
@@ -40,15 +32,15 @@ private
   end
 
   def get_new_handle(database = nil)
-    database ||= @database
-    dbmsg = database.to_s.strip.empty? ? 'no default database' : "database #{database}"
-    dohlog.info("connecting to #@host port #@port as username #@username, #{dbmsg}")
-    mysqlh = Mysql2::Client.new(:host => @host, :username => @username, :password => @password, :database => database, :port => @port)
-    Handle.new(mysqlh, @row_builder)
+    local_config = @config.dup
+    local_config[:database] = database if database
+    dohlog.info("connecting with config: #{local_config}")
+    local_config.delete(:timeout)
+    Handle.new(local_config)
   end
 
   def passed_timeout?
-    Time.now > @last_used + @timeout
+    Time.now > @last_used + @config[:timeout]
   end
 end
 

data/lib/doh/mysql/connector_instance.rb

@@ -32,12 +32,16 @@ def self.insert(statement)
   request_handle.insert(statement)
 end
 
-def self.insert_hash(hash, table, ignore = nil)
-  request_handle.insert_hash(hash, table, ignore)
+def self.insert_hash(hash, table, quote_strings = true)
+  request_handle.insert_hash(hash, table, quote_strings)
 end
 
-def self.replace_hash(hash, table)
-  request_handle.replace_hash(hash, table)
+def self.insert_ignore_hash(hash, table, quote_strings = true)
+  request_handle.insert_ignore_hash(hash, table, quote_strings)
+end
+
+def self.replace_hash(hash, table, quote_strings = true)
+  request_handle.replace_hash(hash, table, quote_strings)
 end
 
 def self.select(statement, row_builder = nil)

data/lib/doh/mysql/database_creator.rb

@@ -1,36 +1,35 @@
 require 'doh/core_ext/dir'
 require 'doh/mysql/handle'
 require 'doh/mysql/load_sql'
-require 'doh/mysql/version'
-require 'doh/mysql/types'
+require 'yaml'
 
 module DohDb
 
 class DatabaseCreator
-  def initialize(data_directory = nil, connector = nil)
-    @data_directory = data_directory || File.join(Doh::root, 'database')
+  def initialize(sqlfiles_directory = nil, connector = nil)
+    @sqlfiles_directory = sqlfiles_directory || File.join(Doh::root, 'database')
     @connector = connector || DohDb::connector_instance
     @include_scripts = true
   end
 
   def create_database(dbname, drop_first = false)
-    create_one_database(get_nodb_handle, dbname, dbname, drop_first)
+    create_one_database(get_handle(''), dbname, dbname, drop_first)
   end
 
   def create_database_copy(dest_db, source_db, drop_first = false)
-    create_one_database(get_nodb_handle, dest_db, source_db, drop_first)
+    create_one_database(get_handle(''), dest_db, source_db, drop_first)
   end
 
   def create_all_databases(drop_first = false)
-    dbh = get_nodb_handle
-    Dir.directories(@data_directory).each {|elem| create_one_database(dbh, elem, elem, drop_first)}
+    dbh = get_handle('')
+    Dir.directories(@sqlfiles_directory).each {|elem| create_one_database(dbh, elem, elem, drop_first)}
   end
 
   def create_tables(database, drop_first, *table_and_view_names)
-    @connector.database = database
+    dbh = get_handle(database)
     views, tables = table_and_view_names.flatten.sort.partition {|name| File.exist?(sql_filename(database, 'views', name))}
-    tables.each {|name| create_base_table(database, name, drop_first)}
-    views.each {|name| create_view(database, name, drop_first)}
+    tables.each {|name| create_base_table(dbh, database, name, drop_first)}
+    views.each {|name| create_view(dbh, database, name, drop_first)}
   end
 
   def exclude_scripts
@@ -39,56 +38,53 @@ class DatabaseCreator
   end
 
 private
-  def get_nodb_handle
+  def get_handle(database)
     @connector.reset
-    @connector.database = ''
+    @connector.config[:database] = database
     @connector.request_handle
   end
 
   def sql_filename(database, subdir, name)
-    File.join(@data_directory, database, subdir, name) + '.sql'
+    File.join(@sqlfiles_directory, database, subdir, name) + '.sql'
   end
 
   def find_files(source_db, subdir, ext = '.sql')
-    path = File.join(@data_directory, source_db, subdir)
+    path = File.join(@sqlfiles_directory, source_db, subdir)
     return [] unless File.exist?(path)
     Dir.entries(path).find_all {|entry| entry.end_with?(ext)}.sort.collect {|elem| File.join(path, elem)}
   end
 
   def view_files(source_db)
-    path = File.join(@data_directory, source_db, 'views')
+    path = File.join(@sqlfiles_directory, source_db, 'views')
     return [] unless File.exist?(path)
     ordered_filenames = YAML.load_file(File.join(path, 'order.yml')).collect {|uqfn| File.join(path, uqfn) + '.sql'}
     ordered_filenames + (find_files(source_db, 'views') - ordered_filenames)
   end
 
-  def create_base_table(database, table_name, drop_first)
-    DohDb::query("DROP TABLE IF EXISTS #{table_name}") if drop_first
+  def create_base_table(dbh, database, table_name, drop_first)
+    dbh.query("DROP TABLE IF EXISTS #{table_name}") if drop_first
     files = [sql_filename(database, 'tables', table_name)]
     inserts_file = sql_filename(database, 'insert_sql', table_name)
     files.push(inserts_file) if File.exist?(inserts_file)
-    DohDb::load_sql_connector(files, DohDb::connector_instance)
+    DohDb::load_sql(dbh.config, files)
   end
 
-  def create_view(database, view_name, drop_first)
-    DohDb::query("DROP VIEW IF EXISTS #{view_name}") if drop_first
-    DohDb::load_sql_connector([sql_filename(database, 'views', view_name)], DohDb::connector_instance)
+  def create_view(dbh, database, view_name, drop_first)
+    dbh.query("DROP VIEW IF EXISTS #{view_name}") if drop_first
+    DohDb::load_sql(dbh.config, [sql_filename(database, 'views', view_name)])
   end
 
   def create_one_database(dbh, dest_db, source_db, drop_first)
-    dohlog.info("creating database " + dest_db + " from source files at " + File.join(@data_directory, source_db))
+    dohlog.info("creating database " + dest_db + " from source files at " + File.join(@sqlfiles_directory, source_db))
     dbh.query("DROP DATABASE IF EXISTS " + dest_db) if drop_first
 
     dbh.query("CREATE DATABASE " + dest_db)
     dbh.query("USE " + dest_db)
-    dbh.query("CREATE TABLE version (version INT UNSIGNED NOT NULL) ENGINE=MyISAM")
-    dbver = DohDb::latest_database_version(source_db)
-    dbh.query("INSERT INTO version VALUES (#{dbver})")
 
-    @connector.database = dest_db
+    @connector.config[:database] = dest_db
 
     files = find_files(source_db, 'tables') + find_files(source_db, 'insert_sql') + view_files(source_db)
-    DohDb::load_sql_connector(files, @connector, dest_db)
+    DohDb::load_sql(@connector.config, files)
     return unless @include_scripts
     find_files(source_db, 'insert_scripts', '.rb').each do |filename|
       dohlog.info("loading file: #{filename}")

data/lib/doh/mysql/db_date.rb

@@ -1,3 +1,4 @@
+require 'doh/core_ext/date'
 require 'doh/core_ext/datewithtime'
 require 'doh/mysql/to_sql'
 
@@ -16,12 +17,12 @@ class DateTimeNow < DateTime
 end
 
 def self.today
-  day = Date.today
+  day = Date.utcday
   DateToday.new(day.year, day.month, day.mday)
 end
 
 def self.now
-  dt = DateTime.now.utc
+  dt = DateTime.utcnow
   DateTimeNow.new(dt.year, dt.month, dt.mday, dt.hour, dt.min, dt.sec, dt.zone)
 end
 

data/lib/doh/mysql/handle.rb

@@ -1,3 +1,4 @@
+require 'mysql2'
 require 'doh/array_to_hash'
 require 'doh/log/stub'
 require 'doh/mysql/error'
@@ -6,18 +7,22 @@ require 'doh/mysql/writable_row'
 require 'doh/mysql/hash_row'
 require 'doh/mysql/smart_row'
 require 'doh/mysql/to_sql'
+Mysql2::Client.default_query_options[:cast_booleans] = true
 
 module DohDb
 
 class Handle
-  def initialize(mysqlh, row_builder = nil)
-    @mysqlh = mysqlh
-    @row_builder = row_builder || TypedRowBuilder.new
+  attr_reader :config, :mysqlh
+
+  def initialize(config)
+    @config = config
+    @mysqlh = Mysql2::Client.new(@config)
+    dohlog.info("new connection created: id #{@mysqlh.thread_id}")
   end
 
   def close
     unless closed?
-      dohlog.info("closing raw mysql handle: #@mysqlh")
+      dohlog.info("closing connection: id #{@mysqlh.thread_id}")
       @mysqlh.close
       @mysqlh = nil
     end
@@ -59,13 +64,16 @@ class Handle
     retval
   end
 
-  def insert_hash(hash, table, ignore = nil)
-    if ignore then keyword = 'INSERT IGNORE' else keyword = 'INSERT' end
-    insert_hash_helper(hash, table, keyword)
+  def insert_hash(hash, table, quote_strings = true)
+    insert_hash_helper(hash, table, 'INSERT', quote_strings)
+  end
+
+  def insert_ignore_hash(hash, table, quote_strings = true)
+    insert_hash_helper(hash, table, 'INSERT IGNORE', quote_strings)
   end
 
-  def replace_hash(hash, table)
-    insert_hash_helper(hash, table, 'REPLACE')
+  def replace_hash(hash, table, quote_strings = true)
+    insert_hash_helper(hash, table, 'REPLACE', quote_strings)
   end
 
   # The most generic form of select.
@@ -150,12 +158,12 @@ private
     raise
   end
 
-  def insert_hash_helper(hash, table, keyword)
+  def insert_hash_helper(hash, table, keyword, quote_strings)
     names = []
     values = []
     hash.each_pair do |key, value|
       names.push(key)
-      values.push(value.to_sql)
+      values.push(if quote_strings || !value.is_a?(String) then value.to_sql else value end)
     end
 
     insert("#{keyword} INTO #{table} (#{names.join(',')}) VALUES (#{values.join(',')})")
@@ -163,7 +171,7 @@ private
 
   def get_row_builder(row_builder = nil)
     if row_builder.nil?
-      @row_builder
+      TypedRowBuilder.new
     elsif row_builder == :read
       TypedRowBuilder.new(ReadOnlyRow)
     elsif row_builder == :hash

data/lib/doh/mysql/load_sql.rb

@@ -3,12 +3,11 @@ require 'doh/mysql/connector_instance'
 module DohDb
 
 def self.mysql_arg(value, option_specifier)
-  return '' if value.to_s.strip.empty?
-  ' -' + option_specifier + value
+  if value.to_s.strip.empty? then '' else " -#{option_specifier}#{value}" end
 end
 
-def self.load_sql(filenames, host, username, password, database)
-  mysqlcmd = 'mysql' + mysql_arg(host, 'h') + mysql_arg(username, 'u') + mysql_arg(password, 'p') + ' ' + database
+def self.load_sql(dbconfig, filenames)
+  mysqlcmd = 'mysql' + mysql_arg(dbconfig[:host], 'h') + mysql_arg(dbconfig[:username], 'u') + mysql_arg(dbconfig[:password], 'p') + ' ' + dbconfig[:database]
   io = IO::popen(mysqlcmd, 'r+')
   dohlog.debug("loading sql file: " + filenames.first) if filenames.size == 1
   filenames.each do |elem|
@@ -17,10 +16,5 @@ def self.load_sql(filenames, host, username, password, database)
   io.close
 end
 
-def self.load_sql_connector(filenames, connector = nil, alternate_database = nil)
-  connector ||= DohDb::connector_instance
-  load_sql(filenames, connector.host, connector.username, connector.password, alternate_database || connector.database)
-end
-
 end
 

data/lib/doh/mysql/metadata_util.rb

@@ -1,14 +1,13 @@
-require 'doh/mysql'
-require 'doh/mysql/to_sql'
+require 'doh/mysql/connector_instance'
 
 module DohDb
 
 @@cached_column_info = {}
 def self.column_info(table, database = nil)
-  database ||= DohDb::connector_instance.database
+  database ||= DohDb::connector_instance.config[:database]
   lookup_str = database + '.' + table
   return @@cached_column_info[lookup_str] if @@cached_column_info[lookup_str]
-  stmt = "SELECT column_name, is_nullable, data_type, character_maximum_length, numeric_scale, column_type FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=#{database.to_sql} AND TABLE_NAME=#{table.to_sql}"
+  stmt = "SELECT column_name, is_nullable, data_type, character_maximum_length, numeric_scale, column_type FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='#{database}' AND TABLE_NAME='#{table}'"
   @@cached_column_info[lookup_str] = DohDb::select_transpose(stmt)
 end
 
@@ -40,12 +39,12 @@ def self.find_primary_key(table, database = nil)
     database = table.before('.')
     table = table.after('.')
   else
-    database ||= DohDb::connector_instance.database
+    database ||= DohDb::connector_instance.config[:database]
   end
 
   dbhash = @@primary_keys[database]
   if dbhash.nil?
-    dbhash = DohDb::select_transpose("SELECT table_name, column_name FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=#{database.to_sql} AND ORDINAL_POSITION=1")
+    dbhash = DohDb::select_transpose("SELECT table_name, column_name FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='#{database}' AND ORDINAL_POSITION=1")
     raise "no information found for database #{database}" if dbhash.empty?
     @@primary_keys[database] = dbhash
   end
@@ -65,7 +64,7 @@ end
 
 @@tables_by_database = {}
 def self.all_tables(database = nil)
-  database ||= DohDb::connector_instance.database
+  database ||= DohDb::connector_instance.config[:database]
   @@tables_by_database[database] ||
     @@tables_by_database[database] ||= DohDb::select_list("SELECT table_name FROM information_schema.tables WHERE table_schema = '#{database}'")
 end

data/lib/doh/mysql/smart_row.rb

@@ -1,6 +1,7 @@
 require 'doh/mysql/writable_row'
 require 'doh/to_display'
 require 'doh/mysql/virtual'
+require 'sqlstmt/update'
 
 module DohDb
 
@@ -81,10 +82,6 @@ class AbstractSmartRow < AbstractRow
     @values.delete_at(index)
   end
 
-  def record_id=(value)
-    set(primary_key, value)
-  end
-
   def db_insert
     newid = DohDb::insert_hash(self, @table)
     if newid != 0
@@ -96,8 +93,9 @@ class AbstractSmartRow < AbstractRow
   def db_update
     return if @changed_keys.empty?
     before_db_update
-    builder = BuildSQL::SimpleUpdateRow.new(@table, nil, get(primary_key), primary_key)
-    @changed_keys.each {|key| builder.setc(key, get(key).to_sql)}
+    builder = SqlStmt::Update.new.table(@table)
+    builder.where("#{primary_key} = #{get(primary_key).to_sql}")
+    @changed_keys.each {|key| builder.field(key, get(key).to_sql)}
     DohDb::query(builder)
     after_db_update
     @changed_keys.clear

data/lib/doh/mysql.rb

@@ -4,4 +4,3 @@ require 'doh/mysql/handle'
 require 'doh/mysql/to_sql'
 require 'doh/mysql/db_date'
 require 'doh/mysql/unquoted'
-require 'doh/mysql/activate'

data/test/cache_connector.dt.rb

@@ -1,20 +1,19 @@
-require_relative 'db_unit_test'
+require 'doh/mysql/cache_connector'
+require_relative 'helpers'
 
 module DohDb
 
 class Test_CacheConnector < DohTest::TestGroup
   def create_table
-    @cc.request_handle.query("CREATE TEMPORARY TABLE #@tbl (id INT AUTO_INCREMENT KEY)")
+    @cc.request_handle.query("CREATE TEMPORARY TABLE #{tbl} (id INT AUTO_INCREMENT KEY)")
   end
 
   def insert_record
-    @cc.request_handle.insert("INSERT INTO #@tbl (id) VALUES (null)")
+    @cc.request_handle.insert("INSERT INTO #{tbl} (id) VALUES (NULL)")
   end
 
   def test_stuff
-    sharedcc = DohDb::connector_instance
-    @cc = DohDb::CacheConnector.new(sharedcc.host, sharedcc.username, sharedcc.password, sharedcc.database, sharedcc.row_builder)
-    @tbl = 'doh_mysql_cache_connector_stuff_test'
+    @cc = DohDb::CacheConnector.new(dbcfg)
 
     create_table
     assert_equal(1, insert_record)
@@ -22,10 +21,10 @@ class Test_CacheConnector < DohTest::TestGroup
     dbh = @cc.request_handle
     assert_equal(2, insert_record)
     dbh.close
-    # temporary table gets deleted on handle close
+
+    # temporary table should get deleted when the connection closes
     create_table
 
-    #test it resets the handle
     @cc.reset
     create_table
     @cc.reset
@@ -33,7 +32,7 @@ class Test_CacheConnector < DohTest::TestGroup
 
     # test it still works after timeout
     create_table
-    @cc.timeout = -1
+    @cc.config[:timeout] = -1
     create_table
   end
 end

data/test/connector_instance.dt.rb

@@ -1,10 +1,11 @@
-require_relative 'db_unit_test'
+require 'doh/mysql/connector_instance'
+require_relative 'helpers'
 
 module DohDb
 
 class Test_ConnectorInstance < DohTest::TestGroup
   def test_stuff
-    tbl = "doh_mysql_connector_instance_stuff_test"
+    init_global_connector
     DohDb::query("CREATE TEMPORARY TABLE #{tbl} (id INT UNSIGNED AUTO_INCREMENT NOT NULL KEY, value INT NOT NULL DEFAULT 0, created_on DATE, created_at DATETIME, money DECIMAL(7,2) NOT NULL DEFAULT 0)")
     assert_equal(1, DohDb::insert("INSERT INTO #{tbl} (id, created_on, created_at, money) VALUES (null, CURDATE(), '2007-01-01 10:30:05', 10.5)"))
     assert_equal(2, DohDb::insert("INSERT INTO #{tbl} (id, created_on) VALUES (null, 0)"))

data/test/handle.dt.rb

@@ -1,12 +1,11 @@
-require_relative 'db_unit_test'
-require 'doh/core_ext/hash'
+require_relative 'helpers'
+require 'doh/mysql/handle'
 
 module DohDb
 
 class Test_Handle < DohTest::TestGroup
   def test_stuff
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_handle_stuff_test"
+    dbh = get_dbh
     dbh.query("CREATE TEMPORARY TABLE #{tbl} (id INT UNSIGNED AUTO_INCREMENT NOT NULL KEY, value INT NOT NULL DEFAULT 0, created_on DATE, created_at DATETIME, money DECIMAL(7,2) NOT NULL DEFAULT 0)")
     assert_equal(1, dbh.insert("INSERT INTO #{tbl} (id, created_on, created_at, money) VALUES (null, CURDATE(), '2007-01-01 10:30:05', 10.5)"))
     assert_equal(2, dbh.insert("INSERT INTO #{tbl} (id, created_on, created_at) VALUES (null, 0, 0)"))
@@ -18,48 +17,44 @@ class Test_Handle < DohTest::TestGroup
   end
 
   def test_select_transpose_2fields
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_handle_select_transpose_2fields_test"
-    DohDb::query("CREATE TEMPORARY TABLE #{tbl} (field CHAR(30) NOT NULL, value CHAR(30) NOT NULL)")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'some_name', value = 'some_value'")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'other_name', value = 'matching_other_value'")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'yet_another_name', value = 'strange_value'")
-    hash = DohDb::select_transpose("SELECT field, value FROM #{tbl}")
+    dbh = get_dbh
+    dbh.query("CREATE TEMPORARY TABLE #{tbl} (field CHAR(30) NOT NULL, value CHAR(30) NOT NULL)")
+    dbh.query("INSERT INTO #{tbl} SET field = 'some_name', value = 'some_value'")
+    dbh.query("INSERT INTO #{tbl} SET field = 'other_name', value = 'matching_other_value'")
+    dbh.query("INSERT INTO #{tbl} SET field = 'yet_another_name', value = 'strange_value'")
+    hash = dbh.select_transpose("SELECT field, value FROM #{tbl}")
     assert_equal('some_value', hash['some_name'])
     assert_equal('matching_other_value', hash['other_name'])
     assert_equal('strange_value', hash['yet_another_name'])
   end
 
   def test_select_transpose_3fields
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_handle_select_transpose_3fields_test"
-    DohDb::query("CREATE TEMPORARY TABLE #{tbl} (field CHAR(30), some_value CHAR(30), other_value CHAR(30))")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'some_name', some_value = 'some_value', other_value = 'blah'")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'other_name', some_value = 'matching_other_value', other_value = 'blee'")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'yet_another_name', some_value = 'strange_value', other_value = 'bloo'")
-    hash = DohDb::select_transpose("SELECT field, some_value, other_value FROM #{tbl}")
+    dbh = get_dbh
+    dbh.query("CREATE TEMPORARY TABLE #{tbl} (field CHAR(30), some_value CHAR(30), other_value CHAR(30))")
+    dbh.query("INSERT INTO #{tbl} SET field = 'some_name', some_value = 'some_value', other_value = 'blah'")
+    dbh.query("INSERT INTO #{tbl} SET field = 'other_name', some_value = 'matching_other_value', other_value = 'blee'")
+    dbh.query("INSERT INTO #{tbl} SET field = 'yet_another_name', some_value = 'strange_value', other_value = 'bloo'")
+    hash = dbh.select_transpose("SELECT field, some_value, other_value FROM #{tbl}")
     assert_equal(hash['some_name'], {'some_value' => 'some_value', 'other_value' => 'blah'})
     assert_equal(hash['other_name'], {'some_value' => 'matching_other_value', 'other_value' => 'blee'})
     assert_equal(hash['yet_another_name'], {'some_value' => 'strange_value', 'other_value' => 'bloo'})
   end
 
   def test_select_values
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_handle_select_values_test"
-    DohDb::query("CREATE TEMPORARY TABLE #{tbl} (field CHAR(30), some_value CHAR(30))")
-    DohDb::query("INSERT INTO #{tbl} SET field = 'some_name', some_value = 'some_value'")
-    assert_equal([['some_name', 'some_value']], DohDb::select_values("SELECT field, some_value FROM #{tbl}"))
-    assert_equal([['some_name']], DohDb::select_values("SELECT field FROM #{tbl}"))
+    dbh = get_dbh
+    dbh.query("CREATE TEMPORARY TABLE #{tbl} (field CHAR(30), some_value CHAR(30))")
+    dbh.query("INSERT INTO #{tbl} SET field = 'some_name', some_value = 'some_value'")
+    assert_equal([['some_name', 'some_value']], dbh.select_values("SELECT field, some_value FROM #{tbl}"))
+    assert_equal([['some_name']], dbh.select_values("SELECT field FROM #{tbl}"))
   end
 
   def test_insert_hash
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_insert_hash_test"
+    dbh = get_dbh
     dbh.query("CREATE TEMPORARY TABLE #{tbl} (value INT KEY)")
     hash1 = {'value' => 1}
     assert_equal(0, dbh.insert_hash(hash1, tbl))
     assert_raises(Mysql2::Error) { dbh.insert_hash(hash1, tbl) }
-    assert_equal(0, dbh.insert_hash(hash1, tbl, true))
+    assert_equal(0, dbh.insert_ignore_hash(hash1, tbl))
   end
 end
 

data/test/helpers.rb

@@ -0,0 +1,32 @@
+module InternalTestHelpers
+  def dbcfg
+    { :host => 'localhost', :username => 'root', :database => 'test' }
+  end
+
+  def tbl
+    @tbl ||= self.class.to_s.gsub(/:/, '_').downcase
+  end
+
+  def drop_stmt
+    "DROP TABLE IF EXISTS #{tbl}"
+  end
+
+  def drop_tbl
+    get_dbh.query("DROP TABLE IF EXISTS #{tbl}")
+  end
+
+  def get_dbh
+    require 'doh/mysql/handle'
+    DohDb::Handle.new(dbcfg)
+  end
+
+  def init_global_connector
+    require 'doh/mysql/connector_instance'
+    require 'doh/mysql/cache_connector'
+    DohDb::set_connector_instance(DohDb::CacheConnector.new(dbcfg))
+  end
+end
+
+class DohTest::TestGroup
+  include InternalTestHelpers
+end

data/test/metadata_util.dt.rb

@@ -1,15 +1,24 @@
-require_relative 'db_unit_test'
+require_relative 'helpers'
 require 'doh/mysql/metadata_util'
 
 module DohDb
 
 class Test_metadata_util < DohTest::TestGroup
-  def tbl
-    "doh_mysql_metadata_util_test"
+  def before_all
+    # TODO: shouldn't really have to do this, but for now metadata_util is dependent on it
+    init_global_connector
+  end
+
+  def before_each
+    drop_tbl
+  end
+
+  def after_each
+    drop_tbl
   end
 
   def test_stuff
-    dbh = DohDb::request_handle
+    dbh = get_dbh
     dbh.query("CREATE TABLE #{tbl} (num INT, str CHAR(7))")
     column_info = DohDb::column_info(tbl)
     info = column_info['str']
@@ -40,14 +49,6 @@ class Test_metadata_util < DohTest::TestGroup
     assert_raises(RuntimeError) { DohDb::find_primary_key(tbl, "this_database_doesnt_exist") }
     assert_raises(RuntimeError) { DohDb::find_primary_key("this table doesn't exist") }
   end
-
-  def before_each
-    DohDb::query("DROP TABLE IF EXISTS #{tbl}")
-  end
-
-  def after_each
-    DohDb::query("DROP TABLE IF EXISTS #{tbl}")
-  end
 end
 
 end

data/test/typecasting.dt.rb

@@ -0,0 +1,24 @@
+require_relative 'helpers'
+require 'mysql2'
+
+module DohDb
+
+class Test_typecasting < DohTest::TestGroup
+  def test_stuff
+    Mysql2::Client.default_query_options[:database_timezone] = :utc
+    Mysql2::Client.default_query_options[:application_timezone] = :utc
+
+    dbh = get_dbh
+    dbh.query("CREATE TEMPORARY TABLE #{tbl} (char_field CHAR(1) NOT NULL, int_field INT, bool_field TINYINT(1), date_field DATE, datetime_field DATETIME, decimal_field DECIMAL(7,2))")
+    dbh.insert("INSERT INTO #{tbl} SET char_field = 'c', int_field = 5, bool_field = 1, date_field = '2012-02-20', datetime_field = '2012-02-20 21:06:00', decimal_field = 54.12")
+    row = dbh.select_row("SELECT * FROM #{tbl}")
+    assert_equal('c', row['char_field'])
+    assert_equal(5, row['int_field'])
+    assert_equal(true, row['bool_field'])
+    assert_equal(Date.new(2012,2,20), row['date_field'])
+    assert_equal(DateTime.new(2012,2,20, 21, 6, 0), row['datetime_field'])
+    assert_equal(BigDecimal('54.12'), row['decimal_field'])
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dohroot
+  requirement: &70154500522900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70154500522900
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70362932067240 !ruby/object:Gem::Requirement
+  requirement: &70154500522240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70362932067240
+  version_requirements: *70154500522240
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70362932066660 !ruby/object:Gem::Requirement
+  requirement: &70154500521540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,29 +44,29 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70362932066660
+  version_requirements: *70154500521540
 - !ruby/object:Gem::Dependency
   name: sqlstmt
-  requirement: &70362932065940 !ruby/object:Gem::Requirement
+  requirement: &70154500520920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70362932065940
+  version_requirements: *70154500520920
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70362932065220 !ruby/object:Gem::Requirement
+  requirement: &70154500520300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.7
   type: :development
   prerelease: false
-  version_requirements: *70362932065220
+  version_requirements: *70154500520300
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com
@@ -67,11 +78,9 @@ extra_rdoc_files:
 files:
 - bin/makedb
 - lib/doh/mysql/abstract_row.rb
-- lib/doh/mysql/activate.rb
 - lib/doh/mysql/cache_connector.rb
 - lib/doh/mysql/connector_instance.rb
 - lib/doh/mysql/connector_util.rb
-- lib/doh/mysql/convert.rb
 - lib/doh/mysql/current_date.rb
 - lib/doh/mysql/database_creator.rb
 - lib/doh/mysql/db_date.rb
@@ -83,29 +92,24 @@ files:
 - lib/doh/mysql/parse.rb
 - lib/doh/mysql/raw_row_builder.rb
 - lib/doh/mysql/readonly_row.rb
-- lib/doh/mysql/require_dbtypes.rb
 - lib/doh/mysql/smart_row.rb
 - lib/doh/mysql/to_sql.rb
 - lib/doh/mysql/typed_row_builder.rb
 - lib/doh/mysql/types.rb
 - lib/doh/mysql/unquoted.rb
-- lib/doh/mysql/version.rb
 - lib/doh/mysql/virtual.rb
 - lib/doh/mysql/writable_row.rb
 - lib/doh/mysql.rb
 - test/cache_connector.dt.rb
-- test/connector.yml
-- test/connector.yml.tmpl
 - test/connector_instance.dt.rb
-- test/convert.dt.rb
-- test/db_unit_test.rb
 - test/handle.dt.rb
+- test/helpers.rb
 - test/metadata_util.dt.rb
 - test/parse.dt.rb
 - test/readonly_row.dt.rb
 - test/smart_row.dt.rb
 - test/to_sql.dt.rb
-- test/types.dt.rb
+- test/typecasting.dt.rb
 - test/unquoted.dt.rb
 - test/writable_row.dt.rb
 - MIT-LICENSE
@@ -137,15 +141,14 @@ summary: friendly mysql client interface
 test_files:
 - test/cache_connector.dt.rb
 - test/connector_instance.dt.rb
-- test/convert.dt.rb
-- test/db_unit_test.rb
 - test/handle.dt.rb
+- test/helpers.rb
 - test/metadata_util.dt.rb
 - test/parse.dt.rb
 - test/readonly_row.dt.rb
 - test/smart_row.dt.rb
 - test/to_sql.dt.rb
-- test/types.dt.rb
+- test/typecasting.dt.rb
 - test/unquoted.dt.rb
 - test/writable_row.dt.rb
 has_rdoc: 

data/lib/doh/mysql/activate.rb

@@ -1,26 +0,0 @@
-require 'doh/mysql/cache_connector'
-require 'doh/mysql/connector_instance'
-require 'doh/mysql/handle'
-require 'doh/mysql/to_sql'
-require 'doh/mysql/db_date'
-require 'doh/mysql/unquoted'
-require 'doh/config'
-
-module DohDb
-
-def self.activate
-  root_cfg = Doh::config
-  return unless root_cfg.fetch('enable_database', true)
-  return unless root_cfg.key?('database')
-  db_cfg = root_cfg['database']
-  require 'doh/mysql'
-  require 'doh/mysql/require_dbtypes'
-  conn = DohDb::CacheConnector.new(db_cfg['host'], db_cfg['username'], db_cfg['password'], db_cfg['database'] || root_cfg['primary_database'])
-  conn.port = db_cfg['port']
-  conn.timeout = db_cfg['timeout'].to_i if db_cfg['timeout']
-  conn.row_builder = db_cfg['row_builder'] || root_cfg['row_builder']
-  DohDb::set_connector_instance(conn)
-  DohDb::require_dbtypes
-end
-
-end

data/lib/doh/mysql/convert.rb

@@ -1,18 +0,0 @@
-require 'doh/mysql/metadata_util'
-require 'doh/mysql/error'
-
-module DohDb
-
-def self.convert(table, column, value)
-  info = column_info(table)[column]
-#  raise UnknownColumn, "#{table}.#{column}" if info.nil?
-  return value if info.nil?
-  if value.nil?
-    raise CannotBeNull, "#{table}.#{column}" if info['is_nullable'] == 'NO'
-    return nil
-  end
-  return nil if value.is_a?(String) && value.empty? && info['is_nullable'] == 'YES'
-  value
-end
-
-end

data/lib/doh/mysql/require_dbtypes.rb

@@ -1,8 +0,0 @@
-module DohDb
-
-def self.require_dbtypes
-  lib_dbtypes_file = File.join(Doh::root, 'lib/dbtypes.rb')
-  require(lib_dbtypes_file) if File.exist?(lib_dbtypes_file)
-end
-
-end

data/lib/doh/mysql/version.rb

@@ -1,102 +0,0 @@
-require 'doh/mysql/connector_instance'
-require 'yaml'
-
-module DohDb
-
-def self.locked_filename(database)
-  File.join(Doh::root, 'database', database, 'migrate/locked.yml')
-end
-
-def self.migration_filename(database, version, upordown = 'up')
-  version_str = version.to_s.rjust(3, '0')
-  File.join(Doh::root, 'database', database, "migrate/#{version_str}_#{upordown}.sql")
-end
-
-def self.current_database_version(database = nil)
-  if database.nil?
-    table = 'version'
-  else
-    table = database + '.version'
-  end
-  DohDb::select_field("SELECT version FROM #{table}").to_i
-end
-
-def self.latest_database_version(database = nil)
-  locked_version = locked_database_version(database)
-  unlocked_version = locked_version + 1
-  unlocked_migration_file = migration_filename(database, unlocked_version)
-  if File.exist?(unlocked_migration_file)
-    unlocked_version
-  else
-    locked_version
-  end
-end
-
-def self.locked_version_info(database = nil)
-  database ||= (DohDb::connector_instance && DohDb::connector_instance.database) || Doh::config['primary_database']
-  filename = locked_filename(database)
-  return [0, nil] unless File.exist?(filename)
-  YAML.load_file(filename)
-end
-
-def self.locked_database_version(database = nil)
-  locked_version_info(database).first
-end
-
-def self.locked_svn_revision(database = nil)
-  locked_version_info(database).last
-end
-
-def self.update_locked_file(database)
-  locked_file = locked_filename(database)
-  if File.exist?(locked_file)
-    new_version = YAML.load_file(locked_file).first + 1
-  else
-    new_version = 0
-    need_to_add = true
-  end
-
-  file_to_check = ''
-  if need_to_add
-    file_to_check = File.join(Doh::root, "database")
-  else
-    unlocked_migration_file = migration_filename(database, new_version)
-    return [true, "nothing to lock"] unless File.exist?(unlocked_migration_file)
-
-    svnout = `svn st #{unlocked_migration_file}`
-    unless svnout.strip.empty?
-      return [false, "svn status shows local changes to #{unlocked_migration_file} -- this needs to be resolved before updating the migration locked file"]
-    end
-
-    file_to_check = unlocked_migration_file
-  end
-
-  `svn update #{file_to_check}`
-  svnout = `svn st -v #{file_to_check}`.split("\n")
-  svnout =~ /(\d+)/
-  revision = svnout.collect {|elem| elem =~ /(\d+)/; $1.to_i}.max
-  if !revision
-    return [false, "unable to extract svn revision from: '#{svnout}'"]
-  end
-
-  outfile = File.new(locked_file, 'w')
-  outfile.puts([new_version, revision.to_i].inspect)
-  outfile.close
-
-  if need_to_add
-    svnout = `svn add #{locked_file}`
-    if svnout[0,1] != 'A'
-      return [false, "failed to svn add #{locked_file}"]
-    end
-  end
-
-  msg = "migrate lock for #{database} database, version #{new_version}"
-  svnout = `svn ci -m \"#{msg}\"  #{locked_file}`
-  unless svnout.index("Committed revision")
-    return [false, "failed to svn ci #{locked_file}"]
-  end
-
-  [true, "#{locked_file} successfully updated"]
-end
-
-end

data/test/connector.yml

@@ -1,4 +0,0 @@
-host: localhost
-database: test
-username: root
-password:

data/test/connector.yml.tmpl

@@ -1,4 +0,0 @@
-host: localhost
-database: test
-username: doh_mysql
-password:

data/test/convert.dt.rb

@@ -1,45 +0,0 @@
-require_relative 'db_unit_test'
-require 'doh/mysql/convert'
-
-module DohDb
-
-class Test_Convert < DohTest::TestGroup
-  def before_each
-    @tbl = "doh_mysql_convert_tests"
-    DohDb::query("DROP TABLE IF EXISTS #@tbl")
-    DohDb::request_handle.query("CREATE TABLE #{@tbl} (not_null_field CHAR(1) NOT NULL, null_ok_field CHAR(1), int_field INT, bool_field TINYINT(1), date_field DATE, datetime_field DATETIME)")
-  end
-
-  def after_each
-    DohDb::query("DROP TABLE IF EXISTS #@tbl")
-  end
-
-  def convert(value)
-    DohDb::convert(@tbl, @field, value)
-  end
-
-  def verify(converted, original)
-    assert_equal(converted, convert(original))
-  end
-
-  def verify_same(value)
-    verify(value, value)
-  end
-
-  def verify_exception(value, exception_class)
-    assert_raises(exception_class) { convert(value) }
-  end
-
-  def test_nil_null
-#    assert_raises(UnknownColumn) { DohDb::convert('some_table_that_doesnt_exist', 'some_column_that_doesnt_exist', 'blah') }
-    assert_equal('blah', DohDb::convert('some_table_that_doesnt_exist', 'some_column_that_doesnt_exist', 'blah'))
-    assert_equal('blah', DohDb::convert('', 'some_column_that_doesnt_exist', 'blah'))
-    assert_raises(CannotBeNull) { DohDb::convert(@tbl, 'not_null_field', nil) }
-    assert_equal(nil, DohDb::convert(@tbl, 'null_ok_field', nil))
-    assert_equal('', DohDb::convert(@tbl, 'not_null_field', ''))
-    assert_equal(nil, DohDb::convert(@tbl, 'null_ok_field', ''))
-    assert_equal(nil, DohDb::convert(@tbl, 'int_field', ''))
-  end
-end
-
-end

data/test/db_unit_test.rb

@@ -1,10 +0,0 @@
-require 'doh/mysql/connector_instance'
-require 'doh/mysql/cache_connector'
-require 'yaml'
-
-config_filename = File.join(File.dirname(__FILE__), 'connector.yml')
-raise RuntimeError.new("mysql connector configuration file (#{config_filename}) must exist (see #{config_filename}.tmpl for an example)") unless File.exist?(config_filename)
-config = YAML.load_file(config_filename)
-
-connector = DohDb::CacheConnector.new(config['host'], config['username'], config['password'], config['database'])
-DohDb::set_connector_instance(connector)

data/test/types.dt.rb

@@ -1,28 +0,0 @@
-require_relative 'db_unit_test'
-require 'doh/mysql/types'
-
-module DohDb
-
-class Test_types < DohTest::TestGroup
-  def test_stuff
-    Mysql2::Client.default_query_options[:database_timezone] = :utc
-    Mysql2::Client.default_query_options[:application_timezone] = :utc
-    DohDb::connector_instance.reset
-
-    @tbl = "doh_mysql_type_conversion_tests"
-    DohDb::query("DROP TABLE IF EXISTS #@tbl")
-    DohDb::request_handle.query("CREATE TEMPORARY TABLE #{@tbl} (char_field CHAR(1) NOT NULL, int_field INT, bool_field TINYINT(1), date_field DATE, datetime_field DATETIME, decimal_field DECIMAL(7,2))")
-
-    dbh = DohDb::request_handle
-    dbh.insert("INSERT INTO #{@tbl} SET char_field = 'c', int_field = 5, bool_field = 1, date_field = '2012-02-20', datetime_field = '2012-02-20 21:06:00', decimal_field = 54.12")
-    row = dbh.select_row("SELECT * FROM #{@tbl}")
-    assert_equal('c', row['char_field'])
-    assert_equal(5, row['int_field'])
-    assert_equal(true, row['bool_field'])
-    assert_equal(Date.new(2012,2,20), row['date_field'])
-    assert_equal(DateTime.new(2012,2,20, 21, 6, 0).utc, row['datetime_field'])
-    assert_equal(BigDecimal('54.12'), row['decimal_field'])
-  end
-end
-
-end