dohruby 0.1.14 → 0.1.15

data/CHANGELOG

@@ -41,3 +41,18 @@
  * add new random_array_element for nested array cases
 *0.1.14* (May 10th, 2008)
  * add BigDecimal.to_dig
+*0.1.15* (May 21st, 2008)
+ * improved logging format of exceptions
+ * added DohDb::NULL object to represent a database NULL value
+ * added DohDb::today, DohDb::now to represent database functions CURDATE() and NOW()
+ * deleted old Unquoted versions of CURDATE() and NOW()
+ * return & trace affected rows in DohDb::Handle::query
+ * fix typo in doh/mysql/connector_util
+ * added database versions of Doh::current_date & Doh::current_datetime
+ * added unit tests for DohDb::select_as_hash
+ * split out sql file loading from DatabaseCreator to DohDb::load_sql function
+ * added new Date functions: days_in_month, weekday?, and date_only
+ * added view, insert_sql script support to DatabaseCreator
+ * added create_tables function to DatabaseCreator
+ * added notify to logger interface
+ * add DohDb::ReadOnlyRow::each_pair

data/lib/doh/core/date.rb

@@ -1,5 +1,19 @@
 require 'date'
 
+class Date
+  def self.days_in_month(year, month)
+    civil(year, month, -1).mday
+  end
+
+  def weekday?
+    (wday > 0) && (wday < 6)
+  end
+
+  def date_only
+    self
+  end
+end
+
 class DateTime
   def date_only
     Date.new(year, month, mday)

data/lib/doh/logger/{notify_acceptor.rb → email_acceptor.rb}

@@ -2,14 +2,22 @@ require 'net/smtp'
 
 module DohLogger
 
-class NotifyAcceptor
-  def initialize(smtp_server, from_address, to_addresses, logfile_name, subject_format = nil, body_format = nil)
+def self.exception_email_format
+  "%severity: %msg\nlogfile_name: #@logfile_name\nsource_ip: %source_ip\nexception: %exception\nstack:\n%call_stack"
+end
+
+def self.exceptionless_email_format
+  "%severity: %msg\nlogfile_name: #@logfile_name\nsource_ip: %source_ip\n"
+end
+
+class EmailAcceptor
+  def initialize(smtp_server, from_address, to_addresses, logfile_name, subject_format = nil, body_format = DohLogger::exception_email_format)
     @smtp_server = smtp_server
     @from_address = from_address
     @to_addresses = to_addresses
     @logfile_name = logfile_name
-    @subject_formatter = Formatter.new(subject_format || "notify - %msg")
-    @body_formatter = Formatter.new(body_format || "notify: %msg\nlogfile_name: #@logfile_name\nsource_ip: %source_ip\nexception: %exception\nstack:\n%call_stack")
+    @subject_formatter = Formatter.new(subject_format || "%severity - %msg")
+    @body_formatter = Formatter.new(body_format)
   end
 
   def log(event)

data/lib/doh/logger/formatter.rb

@@ -8,7 +8,7 @@ class Formatter
     @formats = {}
     register_format('%severity') {|event| DohLogger::severity_string(event.severity)}
     register_format('%msg') {|event| event.msg}
-    register_format('%exception') {|event| event.exception.to_s}
+    register_format('%exception') {|event| event.exception.class.to_s + ' -- ' + event.exception.to_s}
     register_format('%time') {|event| event.time.strftime("%H:%M:%S.") << "%03d" % (event.time.usec / 1000)}
     register_format('%datetime') {|event| event.time.strftime("%Y-%m-%d %H:%M:%S.") << "%03d" % (event.time.usec / 1000)}
     register_format('%call_stack') {|event| event.call_stack.join("\n")}

data/lib/doh/logger/null_interface.rb

@@ -3,6 +3,7 @@ module DohLogger
 class NullInterface
   def fatal(*ignore) end
   def error(*ignore) end
+  def notify(*ignore) end
   def warn(*ignore)  end
   def info(*ignore)  end
   def debug(*ignore)  end

data/lib/doh/logger/severity.rb

@@ -3,9 +3,10 @@ module DohLogger
 DEBUG = 0
 INFO = 1
 WARN = 2
-ERROR = 3
-FATAL = 4
-SEVERITY_OPTIONS = %w(debug info warning ERROR ***FATAL***)
+NOTIFY = 3
+ERROR = 4
+FATAL = 5
+SEVERITY_OPTIONS = %w(debug info warning NOTIFY ERROR ***FATAL***)
 
 def self.severity_string(numeric_level)
   SEVERITY_OPTIONS[numeric_level]

data/lib/doh/logger/standard_interface.rb

@@ -17,6 +17,10 @@ class StandardInterface
     add(ERROR, msg, excpt)
   end
 
+  def notify(msg)
+    add(NOTIFY, msg)
+  end
+
   def warn(msg)
     add(WARN, msg)
   end
@@ -29,14 +33,14 @@ class StandardInterface
     add(DEBUG, msg)
   end
 
-  def add_acceptor(severity_threshold, acceptor)
-    @acceptors.push([severity_threshold, acceptor])
+  def add_acceptor(severity_threshold, acceptor, exact_severity_only = nil)
+    @acceptors.push([severity_threshold, acceptor, exact_severity_only])
   end
-  
+
 private
   def add(severity, msg, excpt = nil)
     included = []
-    @acceptors.each {|one| included.push(one[1]) if severity >= one[0]}
+    @acceptors.each {|elem| included.push(elem[1]) if (severity >= elem[0] && !elem[2]) || severity == elem[0]}
     @scheduler.push(included, Event.new(severity, msg, excpt))
   end
 end

data/lib/doh/mysql/cache_connector.rb

@@ -5,11 +5,11 @@ require 'doh/mysql/raw_row_builder'
 module DohDb
 
 class CacheConnector
-  attr_accessor :host, :user, :password, :database, :row_builder, :timeout
+  attr_accessor :host, :username, :password, :database, :row_builder, :timeout
 
-  def initialize(host = nil, user = nil, password = nil, database = nil, row_builder = nil)
+  def initialize(host = nil, username = nil, password = nil, database = nil, row_builder = nil)
     @host = host
-    @user = user
+    @username = username
     @password = password
     @database = database
     @timeout = 14400
@@ -37,9 +37,9 @@ private
   end
 
   def get_new_handle(database = nil)
-    Doh::log.info("mysql CacheConnector: connecting to #@host as user #@user, database #@database")
+    Doh::log.info("mysql CacheConnector: connecting to #@host as username #@username, database #@database")
     @last_used = Time.now
-    Handle.new(Mysql.connect(@host, @user, @password, database || @database), @row_builder)
+    Handle.new(Mysql.connect(@host, @username, @password, database || @database), @row_builder)
   end
 
   def passed_timeout?

data/lib/doh/mysql/connector_util.rb

@@ -3,7 +3,7 @@ module DohDb
 def self.create_and_connect(connector, new_default_database = nil, drop_first = true)
   connector.reset
   connector.database = new_default_database if new_default_database
-  dbh = conn.request_handle('')
+  dbh = connector.request_handle('')
   dbh.query("DROP DATABASE IF EXISTS #{connector.database}") if drop_first
   dbh.query("CREATE DATABASE IF NOT EXISTS #{connector.database}")
   dbh.query("USE #{connector.database}")

data/lib/doh/mysql/current_date.rb

@@ -0,0 +1,14 @@
+require 'doh/util/current_date'
+require 'doh/mysql/db_date'
+
+module DohDb
+
+def self.current_date_db
+  Doh::current_date(DohDb::today)
+end
+
+def self.current_datetime_db
+  Doh::current_datetime(DohDb::now)
+end
+
+end

data/lib/doh/mysql/database_creator.rb

@@ -1,25 +1,34 @@
 require 'doh/core/dir'
 require 'doh/mysql/handle'
+require 'doh/mysql/load_sql'
+require 'doh/mysql/connector_instance'
+require 'yaml'
 
 module DohDb
 
 class DatabaseCreator
-  def initialize(connector, data_directory)
-    @connector = connector
+  def initialize(data_directory, connector = nil)
     @data_directory = data_directory
+    @connector = connector || DohDb::connector_instance
   end
 
-  def create(dbname, drop_first = false)
+  def create_database(dbname, drop_first = false)
     create_one_database(get_nodb_handle, dbname, dbname, drop_first)
   end
 
-  def create_copy(dest_db, source_db, drop_first = false)
+  def create_database_copy(dest_db, source_db, drop_first = false)
     create_one_database(get_nodb_handle, dest_db, source_db, drop_first)
   end
 
-  def create_all(drop_first = false)
+  def create_all_databases(drop_first = false)
     dbh = get_nodb_handle
-    Dir.directories(@data_directory).each {|entry| create_one_database(dbh, entry, entry, drop_first)}
+    Dir.directories(@data_directory).each {|elem| create_one_database(dbh, elem, elem, drop_first)}
+  end
+
+  def create_tables(database, drop_first, *table_and_view_names)
+    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)}
   end
 
 private
@@ -29,34 +38,47 @@ private
     @connector.request_handle
   end
 
-  def create_one_database(dbh, dest_db, source_db, drop_first)
-    Doh::log.info("DohDb::DatabaseCreator - creating source database " + source_db + " inside " + dest_db)
-    dbh.query("DROP DATABASE IF EXISTS " + dest_db) if drop_first
-
-    dbh.query("CREATE DATABASE " + dest_db)
-    load_sql_files('tables', source_db, dest_db)
-    load_sql_files('insert_sql', source_db, dest_db)
-
-    @connector.database = dest_db
-    dbh.query("USE " + dest_db)
+  def sql_filename(database, subdir, name)
+    File.join(@data_directory, database, subdir, name) + '.sql'
   end
 
-  def load_sql_files(subdir, source_db, dest_db)
+  def find_files(source_db, subdir, ext = '.sql')
     path = File.join(@data_directory, source_db, subdir)
     return [] unless File.exist?(path)
-    filenames = Dir.entries(path).find_all {|entry| entry.size > 4 && entry[-4..-1] == '.sql'}.sort.collect {|one| File.join(path, one)}
+    Dir.entries(path).find_all {|entry| entry.ends_with(ext)}.sort.collect {|elem| File.join(path, elem)}
+  end
+
+  def view_files(source_db)
+    path = File.join(@data_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
+    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)
+  end
 
-    mysqlcmd = 'mysql' + mysql_arg(@connector.host, 'h') + mysql_arg(@connector.user, 'u') + mysql_arg(@connector.password, 'p') + ' ' + dest_db
-    io = IO::popen(mysqlcmd, 'r+')
-    filenames.each do |flnm|
-      open(flnm) {|file| io << file.read}
-    end
-    io.close
+  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)
   end
 
-  def mysql_arg(value, optkey)
-    return '' if value.nil? || value.empty?
-    ' -' + optkey + value
+  def create_one_database(dbh, dest_db, source_db, drop_first)
+    Doh::log.info("DohDb::DatabaseCreator - creating source database " + source_db + " inside " + dest_db)
+    dbh.query("DROP DATABASE IF EXISTS " + dest_db) if drop_first
+
+    dbh.query("CREATE DATABASE " + dest_db)
+    dbh.query("USE " + dest_db)
+    @connector.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)
+    find_files(source_db, 'insert_scripts', '.rb').each {|filename| load(filename)}
   end
 end
 

data/lib/doh/mysql/db_date.rb

@@ -0,0 +1,28 @@
+require 'date'
+require 'doh/mysql/to_sql'
+
+module DohDb
+
+class DateToday < Date
+  def to_sql
+    'CURDATE()'
+  end
+end
+
+class DateTimeNow < DateTime
+  def to_sql
+    'NOW()'
+  end
+end
+
+def self.today
+  day = Date.today
+  DateToday.new(day.year, day.month, day.mday)
+end
+
+def self.now
+  dt = DateTime.now
+  DateTimeNow.new(dt.year, dt.month, dt.mday, dt.hour, dt.min, dt.sec)
+end
+
+end

data/lib/doh/mysql/db_null.rb

@@ -0,0 +1,24 @@
+require 'doh/mysql/to_sql'
+require 'singleton'
+
+module DohDb
+
+class NullDatabaseValue
+  include Singleton
+
+  def empty?
+    true
+  end
+
+  def to_s
+    ''
+  end
+
+  def to_sql
+    'NULL'
+  end
+end
+
+NULL = NullDatabaseValue.instance
+
+end

data/lib/doh/mysql/handle.rb

@@ -23,32 +23,30 @@ class Handle
   end
 
   def query(statement)
-    sqlstr = statement.to_s
-    Doh::log.info(sqlstr)
-    @mysqlh.query(sqlstr)
-  rescue Exception => excpt
-    Doh::log.error("caught exception during query: #{sqlstr}", excpt)
-    raise
+    generic_query(statement)
+    retval = @mysqlh.affected_rows
+    Doh::log.info("affected #{retval} rows")
+    retval
   end
 
   def update(statement)
-    query(statement)
+    generic_query(statement)
     retval = @mysqlh.affected_rows
     Doh::log.info("updated #{retval} rows")
     retval
   end
 
   def insert(statement)
-    query(statement)
+    generic_query(statement)
     retval = @mysqlh.insert_id
     Doh::log.info("insert_id was #{retval}")
     retval
   end
 
   def select(statement, row_builder = nil)
-    result_set = query(statement)
+    result_set = generic_query(statement)
     Doh::log.info("selected #{result_set.num_rows} rows")
-    rows = (row_builder || @row_builder).new.build_rows(result_set)
+    rows = (row_builder || @row_builder.new).build_rows(result_set)
     result_set.free
     rows
   end
@@ -79,6 +77,16 @@ class Handle
     row = select_optional_row(statement, row_builder)
     row && row.at(0)
   end
+
+private
+  def generic_query(statement)
+    sqlstr = statement.to_s
+    Doh::log.info(sqlstr)
+    @mysqlh.query(sqlstr)
+  rescue Exception => excpt
+    Doh::log.error("caught exception during query: #{sqlstr}", excpt)
+    raise
+  end
 end
 
 end

data/lib/doh/mysql/load_sql.rb

@@ -0,0 +1,22 @@
+module DohDb
+
+def self.mysql_arg(value, option_specifier)
+  return '' if value.to_s.strip.empty?
+  ' -' + option_specifier + value
+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
+  io = IO::popen(mysqlcmd, 'r+')
+  filenames.each do |elem|
+    open(elem) {|file| io << file.read}
+  end
+  io.close
+end
+
+def self.load_sql_connector(filenames, connector, alternate_database = nil)
+  load_sql(filenames, connector.host, connector.username, connector.password, alternate_database || connector.database)
+end
+
+end
+

data/lib/doh/mysql/parse.rb

@@ -14,6 +14,7 @@ def self.parse_bool(str)
 end
 
 def self.parse_datetime(str)
+  raise ArgumentError.new("unexpected value: " + str) unless str.size == 19
   DateTime.parse(str)
 end
 

data/lib/doh/mysql/readonly_row.rb

@@ -42,6 +42,12 @@ class ReadOnlyRow
     to_h.inspect
   end
 
+  def each_pair
+    @keys.size.times do |index|
+      yield(@keys.at(index), @values.at(index))
+    end
+  end
+
   undef id
   def method_missing(sym, *ignore)
     key = sym.to_s

data/lib/doh/mysql.rb

@@ -2,4 +2,3 @@ require 'doh/mysql/cache_connector'
 require 'doh/mysql/connector_instance'
 require 'doh/mysql/handle'
 require 'doh/mysql/to_sql'
-require 'doh/mysql/unquoted'

data/test/logger/sample.rb

@@ -1,14 +1,16 @@
 require 'doh/logger_app'
-require 'doh/logger/notify_acceptor'
+require 'doh/logger/email_acceptor'
 
 scheduler = DohLogger::DirectScheduler.new
 console_acceptor = DohLogger::IOStreamAcceptor.new
 logfile_name = "logger_sample_app.log"
 file_acceptor = DohLogger::IOStreamAcceptor.new(File.new(logfile_name, "wb"))
-notify_acceptor = DohLogger::NotifyAcceptor.new('mail.server.com', 'from@somebody.com', ['recipient_address@gmail.com'], logfile_name)
+error_acceptor = DohLogger::EmailAcceptor.new('localhost', 'from@somebody.com', ['bulbous@gmail.com'], logfile_name)
+notify_acceptor = DohLogger::EmailAcceptor.new('localhost', 'from@somebody.com', ['bulbous@gmail.com'], logfile_name, nil, DohLogger::exceptionless_email_format)
 intrfc = DohLogger::StandardInterface.new(scheduler)
 intrfc.add_acceptor(DohLogger::DEBUG, console_acceptor)
-intrfc.add_acceptor(DohLogger::ERROR, notify_acceptor)
+intrfc.add_acceptor(DohLogger::ERROR, error_acceptor)
+intrfc.add_acceptor(DohLogger::NOTIFY, notify_acceptor, true)
 intrfc.add_acceptor(DohLogger::DEBUG, file_acceptor)
 Doh::set_logger_interface(intrfc)
 
@@ -16,3 +18,4 @@ Doh::log.debug("hello")
 Doh::log.info("hello\nagain")
 Doh::log.info("something else")
 Doh::log.error("uh oh badness!")
+Doh::log.notify("let me know about this")

data/test/logger/tc_acceptor.rb

@@ -10,10 +10,13 @@ module Doh
 class TC_Acceptor < Test::Unit::TestCase
   def setup
     @ios = StringIO.new
+    @ios2 = StringIO.new
     @sched = DohLogger::DirectScheduler.new
     @acceptor = DohLogger::IOStreamAcceptor.new(@ios, '%msg', '%msg error')
+    @acceptor2 = DohLogger::IOStreamAcceptor.new(@ios2, '%msg', '%msg error')
     @interface = DohLogger::StandardInterface.new(@sched)
     @interface.add_acceptor(DohLogger::DEBUG, @acceptor)
+    @interface.add_acceptor(DohLogger::WARN, @acceptor2, true)
   end
 
   def test_log
@@ -26,6 +29,9 @@ class TC_Acceptor < Test::Unit::TestCase
     assert_equal('warn1', events[1])
     assert_equal('error1 error', events[2])
     assert_equal('fatal1 error', events[3])
+    events2 = @ios2.string.split("\n")
+    assert_equal('warn1', events2[0])
+    assert_equal(1, events2.size)
   end
 end
 

data/test/logger/tc_formatter.rb

@@ -29,7 +29,7 @@ class TC_Formatter < Test::Unit::TestCase
     hsh = format_output_to_hash(@formatter.replace(@event))
     assert_equal('debug', hsh['severity'])
     assert_equal('testmessage', hsh['msg'])
-    assert_equal('', hsh['exception'])
+    assert_equal('NilClass -- ', hsh['exception'])
     assert_equal(@time + '.000', hsh['time'])
     assert_equal(@datetime + '.000', hsh['datetime'])
     assert_equal('formatter', hsh['call_stack'].split("\n")[0].before('.rb:').rafter('/'))

data/test/logger/tc_interface.rb

@@ -20,20 +20,23 @@ class TC_Interface < Test::Unit::TestCase
     @interface.debug("debug1")
     @interface.info("info1")
     @interface.warn("warn1")
+    @interface.notify("notify1")
     @interface.error("error1")
     @interface.fatal("fatal1")
     @interface.error("error2_with_exception", RuntimeError.new("test runtime"))
     assert_equal('debug1', @all_acceptor.events[0].msg)
     assert_equal('info1', @all_acceptor.events[1].msg)
     assert_equal('warn1', @all_acceptor.events[2].msg)
-    assert_equal('error1', @all_acceptor.events[3].msg)
-    assert_equal('fatal1', @all_acceptor.events[4].msg)
-    assert_equal('error2_with_exception', @all_acceptor.events[5].msg)
-    assert_equal('test runtime', @all_acceptor.events[5].exception.to_s)
+    assert_equal('notify1', @all_acceptor.events[3].msg)
+    assert_equal('error1', @all_acceptor.events[4].msg)
+    assert_equal('fatal1', @all_acceptor.events[5].msg)
+    assert_equal('error2_with_exception', @all_acceptor.events[6].msg)
+    assert_equal('test runtime', @all_acceptor.events[6].exception.to_s)
 
     assert_equal('warn1', @warn_acceptor.events[0].msg)
-    assert_equal('error1', @warn_acceptor.events[1].msg)
-    assert_equal('fatal1', @warn_acceptor.events[2].msg)
+    assert_equal('notify1', @warn_acceptor.events[1].msg)
+    assert_equal('error1', @warn_acceptor.events[2].msg)
+    assert_equal('fatal1', @warn_acceptor.events[3].msg)
   end
 end
 

data/test/mysql/tc_cache_connector.rb

@@ -13,7 +13,7 @@ class TC_CacheConnector < Test::Unit::TestCase
 
   def test_stuff
     sharedcc = DohDb::connector_instance
-    @cc = DohDb::CacheConnector.new(sharedcc.host, sharedcc.user, sharedcc.password, sharedcc.database, sharedcc.row_builder)
+    @cc = DohDb::CacheConnector.new(sharedcc.host, sharedcc.username, sharedcc.password, sharedcc.database, sharedcc.row_builder)
     @tbl = 'doh_mysql_cache_connector_stuff_test'
 
     create_table

data/test/mysql/tc_hash_util.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__), 'db_unit_test')
+require 'doh/mysql/hash_util'
+
+module DohDb
+
+class TC_HashUtil < Test::Unit::TestCase
+  def test_stuff
+    dbh = DohDb::request_handle
+    tbl = "doh_mysql_hashutil_stuff_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_as_hash("SELECT field, value FROM #{tbl}")
+    DohDb::query("DROP TABLE #{tbl}")
+    assert_equal(hash['some_name'], 'some_value')
+    assert_equal(hash['other_name'], 'matching_other_value')
+    assert_equal(hash['yet_another_name'], 'strange_value')
+  end
+end
+
+end
+

data/test/mysql/tc_parse.rb

@@ -11,12 +11,15 @@ class TC_Convert < Test::Unit::TestCase
   end
 
   def test_date
+    assert_raise(ArgumentError) {DohDb::parse_date('blah')}
     assert_equal(Date.new(2008,2,14), DohDb::parse_date('2008-02-14'))
     assert_raise(ArgumentError) {DohDb::parse_date('20080214')}
     assert_not_equal(Date.new(2008,2,14), DohDb::parse_date('2008-02-15'))
   end
 
   def test_datetime
+    assert_raise(ArgumentError) {DohDb::parse_date('blah')}
+    assert_raise(ArgumentError) {DohDb::parse_datetime('zzzzzzzzzzzzzzzzzzz')}
     assert_equal(DateTime.new(2008,2,14,10,20,30), DohDb::parse_datetime('2008-02-14 10:20:30'))
     assert_not_equal(DateTime.new(2008,2,14,10,20,30), DohDb::parse_datetime('2008-02-14 10:20:31'))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dohruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors: 
 - Makani & Kem Mason
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-10 00:00:00 -06:00
+date: 2008-05-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,12 +49,12 @@ files:
 - lib/doh/data.rb
 - lib/doh/logger
 - lib/doh/logger/direct_scheduler.rb
+- lib/doh/logger/email_acceptor.rb
 - lib/doh/logger/event.rb
 - lib/doh/logger/formatter.rb
 - lib/doh/logger/interface.rb
 - lib/doh/logger/iostream_acceptor.rb
 - lib/doh/logger/memory_acceptor.rb
-- lib/doh/logger/notify_acceptor.rb
 - lib/doh/logger/null_interface.rb
 - lib/doh/logger/severity.rb
 - lib/doh/logger/standard_interface.rb
@@ -65,17 +65,20 @@ files:
 - lib/doh/mysql/cache_connector.rb
 - lib/doh/mysql/connector_instance.rb
 - lib/doh/mysql/connector_util.rb
+- lib/doh/mysql/current_date.rb
 - lib/doh/mysql/database_creator.rb
+- lib/doh/mysql/db_date.rb
+- lib/doh/mysql/db_null.rb
 - lib/doh/mysql/default_type_guesser.rb
 - lib/doh/mysql/error.rb
 - lib/doh/mysql/handle.rb
 - lib/doh/mysql/hash_util.rb
+- lib/doh/mysql/load_sql.rb
 - lib/doh/mysql/parse.rb
 - lib/doh/mysql/raw_row_builder.rb
 - lib/doh/mysql/readonly_row.rb
 - lib/doh/mysql/to_sql.rb
 - lib/doh/mysql/typed_row_builder.rb
-- lib/doh/mysql/unquoted.rb
 - lib/doh/mysql.rb
 - lib/doh/unit_test.rb
 - lib/doh/util
@@ -103,6 +106,7 @@ files:
 - test/mysql/tc_cache_connector.rb
 - test/mysql/tc_connector_instance.rb
 - test/mysql/tc_handle.rb
+- test/mysql/tc_hash_util.rb
 - test/mysql/tc_parse.rb
 - test/mysql/tc_readonly_row.rb
 - README
@@ -146,5 +150,6 @@ test_files:
 - test/mysql/tc_cache_connector.rb
 - test/mysql/tc_connector_instance.rb
 - test/mysql/tc_handle.rb
+- test/mysql/tc_hash_util.rb
 - test/mysql/tc_parse.rb
 - test/mysql/tc_readonly_row.rb

data/lib/doh/mysql/unquoted.rb

@@ -1,12 +0,0 @@
-module DohDb
-
-class Unquoted < String
-  def to_sql
-    to_s
-  end
-end
-
-NOW = Unquoted.new('NOW()')
-CURDATE = Unquoted.new('CURDATE()')
-TODAY = CURDATE
-end