dohmysql 0.1.0 → 0.1.1

data/bin/makedb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'doh/app/pwd'
+require 'doh/app/init_from_pwd'
 require 'doh/options'
 require 'doh/mysql/database_creator'
 

data/lib/doh/mysql/cache_connector.rb

@@ -1,5 +1,7 @@
+require 'mysql2'
 require 'doh/mysql/handle'
 require 'doh/mysql/typed_row_builder'
+Mysql2::Client.default_query_options[:cast_booleans] = true
 
 module DohDb
 
@@ -41,8 +43,7 @@ private
     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 = Mysql.connect(@host, @username, @password, database, @port, nil, Mysql::CLIENT_MULTI_STATEMENTS)
-    mysqlh.query_with_result = false
+    mysqlh = Mysql2::Client.new(:host => @host, :username => @username, :password => @password, :database => database, :port => @port)
     Handle.new(mysqlh, @row_builder)
   end
 

data/lib/doh/mysql/db_date.rb

@@ -1,4 +1,4 @@
-require 'date'
+require 'doh/core_ext/datewithtime'
 require 'doh/mysql/to_sql'
 
 module DohDb
@@ -21,7 +21,7 @@ def self.today
 end
 
 def self.now
-  dt = DateTime.zow
+  dt = DateTime.now.utc
   DateTimeNow.new(dt.year, dt.month, dt.mday, dt.hour, dt.min, dt.sec, dt.zone)
 end
 

data/lib/doh/mysql/handle.rb

@@ -53,7 +53,7 @@ class Handle
 
   def insert(statement)
     generic_query(statement)
-    retval = @mysqlh.insert_id
+    retval = @mysqlh.last_id
     dohlog.info("insert_id was #{retval}")
     retval
   end
@@ -71,9 +71,8 @@ class Handle
   # It calls to_s on the statement object to facilitate the use of sql builder objects.
   def select(statement, row_builder = nil)
     result_set = generic_query(statement)
-    dohlog.info("selected #{result_set.num_rows} rows")
+    dohlog.info("selected #{result_set.size} rows")
     rows = get_row_builder(row_builder).build_rows(result_set)
-    result_set.free
     rows
   end
 
@@ -140,46 +139,11 @@ class Handle
     select(statement, row_builder).collect { |row| row.at(0) }
   end
 
-  def multi_select(statement_infos, dflt_row_builder = nil)
-    statements = []
-    row_builders = []
-    statement_infos.each do |info|
-      if info.is_a?(Array)
-        statements.push(info.first)
-        row_builders.push(info.last)
-      else
-        statements.push(info)
-        row_builders.push(nil)
-      end
-    end
-    sqlstr = statements.join(';')
-
-    dohlog.info(sqlstr)
-    @mysqlh.query(sqlstr)
-    retval = []
-    while true
-      custom_builder = row_builders.shift
-      if @mysqlh.field_count > 0
-        result_set = @mysqlh.store_result
-        dohlog.info("selected #{result_set.num_rows} rows")
-        rows = get_row_builder(custom_builder || dflt_row_builder).build_rows(result_set)
-        result_set.free
-        retval.push(rows)
-      end
-      break unless @mysqlh.next_result
-    end
-    retval
-  rescue Exception => excpt
-    dohlog.error("caught exception during query: #{sqlstr}", excpt)
-    raise
-  end
-
 private
   def generic_query(statement)
     sqlstr = statement.to_s
     dohlog.info(sqlstr)
     @mysqlh.query(sqlstr)
-    @mysqlh.store_result if @mysqlh.field_count > 0
   rescue Exception => excpt
     dohlog.error("caught exception during query: #{sqlstr}", excpt)
     raise

data/lib/doh/mysql/to_sql.rb

@@ -40,6 +40,12 @@ class DateTime
   end
 end
 
+class Time
+  def to_sql
+    '"' + strftime('%Y-%m-%d %H:%M:%S') + '"'
+  end
+end
+
 class TrueClass
   def to_sql
     '1'

data/lib/doh/mysql/typed_row_builder.rb

@@ -1,25 +1,28 @@
 require 'doh/mysql/readonly_row'
-require 'doh/mysql/default_type_guesser'
 
 module DohDb
 
 class TypedRowBuilder
   def initialize(row_klass = nil, guesser = nil)
     @row_klass = row_klass || ReadOnlyRow
-    @guesser = guesser || DefaultTypeGuesser
   end
 
   def build_rows(result_set)
-    meta_info = result_set.fetch_fields
-    field_names = meta_info.collect {|elem| elem.name}
+    return [] if result_set.size == 0
 
     retval = []
     result_set.each do |row|
-      typed_values = []
-      row.each_with_index do |field, index|
-        typed_values[index] = @guesser.guess_type(field, meta_info[index])
+      keys = []
+      values = []
+      row.each_pair do |key, value|
+        keys.push(key)
+        if value.is_a?(Time)
+          values.push(value.to_datetime)
+        else
+          values.push(value)
+        end
       end
-      retval.push(@row_klass.new(field_names, typed_values))
+      retval.push(@row_klass.new(keys, values))
     end
     retval
   end

data/test/connector_instance.dt.rb

@@ -16,7 +16,7 @@ class Test_ConnectorInstance < DohTest::TestGroup
     assert_equal(nil, DohDb::select_optional_field("SELECT money FROM #{tbl} WHERE id = 7"))
     assert_raises(UnexpectedQueryResult) {DohDb::select_field("SELECT money FROM #{tbl} WHERE id = 7")}
     assert_equal(1, DohDb::update_row("UPDATE #{tbl} SET money = 10.95 WHERE id = 1"))
-    assert_raises(Mysql::Error){DohDb::query("some invalid sql here")}
+    assert_raises(Mysql2::Error){DohDb::query("some invalid sql here")}
     # TODO: re-enable
     # assert(DohTest::pop_error)
     assert_raises(UnexpectedQueryResult) {DohDb::update_row("UPDATE #{tbl} SET money = 10.95 WHERE id = 7")}

data/test/handle.dt.rb

@@ -52,59 +52,13 @@ class Test_Handle < DohTest::TestGroup
     assert_equal([['some_name']], DohDb::select_values("SELECT field FROM #{tbl}"))
   end
 
-  def test_multi_select
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_handle_multi_select_test"
-    DohDb::query("CREATE TEMPORARY TABLE #{tbl} (value CHAR(30))")
-    DohDb::query("INSERT INTO #{tbl} SET value = 'first'")
-    DohDb::query("INSERT INTO #{tbl} SET value = 'second'")
-
-    stmts = []
-    stmts.push("SELECT * FROM #{tbl}")
-    stmts.push("INSERT INTO #{tbl} SET value = 'third'")
-    stmts.push(["SELECT * FROM #{tbl}", :hash])
-    stmts.push("SELECT * FROM #{tbl}")
-    stmts.push("INSERT INTO #{tbl} SET value = 'fourth'")
-    stmts.push(["SELECT * FROM #{tbl}", :smart])
-    select_results = DohDb::multi_select(stmts)
-    assert_equal(4, select_results.size)
-    assert_equal(4, DohDb::select_field("SELECT COUNT(*) FROM #{tbl}"))
-
-    curr_select = select_results[0]
-    assert_equal(2, curr_select.size)
-    assert_instance_of(ReadOnlyRow, curr_select[0])
-    assert_equal({'value' => 'first'}, curr_select[0].to_h)
-    assert_equal({'value' => 'second'}, curr_select[1].to_h)
-
-    curr_select = select_results[1]
-    assert_equal(3, curr_select.size)
-    assert_instance_of(Hash, curr_select[0])
-    assert_equal({'value' => 'first'}, curr_select[0].to_h)
-    assert_equal({'value' => 'second'}, curr_select[1].to_h)
-    assert_equal({'value' => 'third'}, curr_select[2].to_h)
-
-    curr_select = select_results[2]
-    assert_equal(3, curr_select.size)
-    assert_equal({'value' => 'first'}, curr_select[0].to_h)
-    assert_equal({'value' => 'second'}, curr_select[1].to_h)
-    assert_equal({'value' => 'third'}, curr_select[2].to_h)
-
-    curr_select = select_results[3]
-    assert_equal(4, curr_select.size)
-    assert_instance_of(SmartRow, curr_select[0])
-    assert_equal({'value' => 'first'}, curr_select[0].to_h)
-    assert_equal({'value' => 'second'}, curr_select[1].to_h)
-    assert_equal({'value' => 'third'}, curr_select[2].to_h)
-    assert_equal({'value' => 'fourth'}, curr_select[3].to_h)
-  end
-
   def test_insert_hash
     dbh = DohDb::request_handle
     tbl = "doh_mysql_insert_hash_test"
     dbh.query("CREATE TEMPORARY TABLE #{tbl} (value INT KEY)")
     hash1 = {'value' => 1}
     assert_equal(0, dbh.insert_hash(hash1, tbl))
-    assert_raises(Mysql::Error) { dbh.insert_hash(hash1, tbl) }
+    assert_raises(Mysql2::Error) { dbh.insert_hash(hash1, tbl) }
     assert_equal(0, dbh.insert_hash(hash1, tbl, true))
   end
 end

data/test/types.dt.rb

@@ -3,29 +3,25 @@ require 'doh/mysql/types'
 
 module DohDb
 
-class ConvertToString
-  def self.build(field, value)
-    value.to_s
-  end
-end
-
 class Test_types < DohTest::TestGroup
   def test_stuff
-    dbh = DohDb::request_handle
-    tbl = "doh_mysql_types_stuff_test"
-    tbl2 = "island.doh_mysql_types_stuff_another_test"
-    DohDb::query("CREATE TEMPORARY TABLE #{tbl} (amount INT)")
-    DohDb::query("INSERT INTO #{tbl} SET amount = NULL")
-    assert_equal(nil, DohDb::select_field("SELECT amount FROM #{tbl}"))
-    DohDb::query("UPDATE #{tbl} SET amount = 5")
-    assert_equal(5, DohDb::select_field("SELECT amount FROM #{tbl}"))
+    Mysql2::Client.default_query_options[:database_timezone] = :utc
+    Mysql2::Client.default_query_options[:application_timezone] = :utc
+    DohDb::connector_instance.reset
 
-    DohDb::query("CREATE TEMPORARY TABLE #{tbl2} (other INT)")
-    DohDb::query("INSERT INTO #{tbl2} SET other = 7")
-    assert_equal(5, DohDb::select_field("SELECT amount, other FROM #{tbl}, #{tbl2}"))
+    @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))")
 
-    DohDb::register_column_type(DohDb::connector_instance.database, tbl, 'amount', ConvertToString)
-    assert_equal('5', DohDb::select_field("SELECT amount FROM #{tbl}"))
+    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(Time.utc(2012,2,20, 21, 6, 0), row['datetime_field'])
+    assert_equal(BigDecimal('54.12'), row['decimal_field'])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,19 +10,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70173088680320 !ruby/object:Gem::Requirement
+  requirement: &70236167835480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70236167835480
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &70236167834600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70173088680320
+  version_requirements: *70236167834600
+- !ruby/object:Gem::Dependency
+  name: dohtest
+  requirement: &70236167833680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :development
+  prerelease: false
+  version_requirements: *70236167833680
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com
@@ -42,7 +64,6 @@ files:
 - lib/doh/mysql/current_date.rb
 - lib/doh/mysql/database_creator.rb
 - lib/doh/mysql/db_date.rb
-- lib/doh/mysql/default_type_guesser.rb
 - lib/doh/mysql/error.rb
 - lib/doh/mysql/handle.rb
 - lib/doh/mysql/hash_row.rb
@@ -116,3 +137,4 @@ test_files:
 - test/types.dt.rb
 - test/unquoted.dt.rb
 - test/writable_row.dt.rb
+has_rdoc: 

data/lib/doh/mysql/default_type_guesser.rb

@@ -1,37 +0,0 @@
-require 'mysql'
-require 'doh/mysql/parse'
-require 'doh/to_display'
-require 'doh/mysql/types'
-require 'doh/core_ext/string'
-
-module DohDb
-
-class DefaultTypeGuesser
-  # for compatibility with older mysql gems
-  if !MysqlField.const_defined?('TYPE_NEWDECIMAL')
-    MysqlField::TYPE_NEWDECIMAL = 246
-  end
-  DECIMAL_TYPES = [MysqlField::TYPE_DECIMAL, MysqlField::TYPE_NEWDECIMAL]
-  INT_TYPES = [MysqlField::TYPE_TINY,MysqlField::TYPE_SHORT,MysqlField::TYPE_LONG,MysqlField::TYPE_LONGLONG,MysqlField::TYPE_INT24]
-
-  def self.guess_type(value, meta)
-    return nil if value.nil?
-
-    custom_type = DohDb::find_column_type(nil, meta.table, meta.name) || DohDb::find_column_type(nil, nil, meta.name)
-    return custom_type.build(meta.name, value) if custom_type
-
-    return DohDb::parse_bool(value) if (meta.type == MysqlField::TYPE_TINY) && (meta.length == 1) && (meta.max_length == 1)
-    return DohDb::parse_datetime(value) if meta.type == MysqlField::TYPE_DATETIME
-    return DohDb::parse_date(value) if meta.type == MysqlField::TYPE_DATE
-    return DohDb::parse_decimal(value) if DECIMAL_TYPES.include?(meta.type)
-    return DohDb::parse_int(value) if INT_TYPES.include?(meta.type)
-    if meta.type == MysqlField::TYPE_STRING || meta.type == MysqlField::TYPE_VAR_STRING
-      return PhoneDisplayString.new(value) if (value.size == 10) && (meta.name.lastn(5) == 'phone')
-      return SsnDisplayString.new(value) if (value.size == 9) && (meta.max_length == 9) && (meta.name.lastn(3) == 'ssn')
-      return PostalDisplayString.new(value) if [5,9].include?(value.size) && [5,9].include?(meta.max_length) && ((meta.name.lastn(6) == 'postal') || (meta.name.lastn(3) == 'zip'))
-    end
-    value
-  end
-end
-
-end