dohmysql 0.1.3 → 0.1.4

data/lib/doh/mysql.rb

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

data/lib/doh/mysql/cache_connector.rb

@@ -12,7 +12,7 @@ class CacheConnector
 
   def request_handle(database = nil)
     if @handle
-      close_handle("handle was unused for too long") if passed_timeout?
+      close_handle('handle was unused for too long') if passed_timeout?
       @handle = nil if @handle && @handle.closed?
     end
     @last_used = Time.now
@@ -20,7 +20,7 @@ class CacheConnector
   end
 
   def reset
-    close_handle("reset")
+    close_handle('reset was called')
   end
 
 private
@@ -34,7 +34,6 @@ private
   def get_new_handle(database = nil)
     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

data/lib/doh/mysql/current_date.rb

@@ -1,7 +1,5 @@
 require 'doh/current_date'
 require 'doh/mysql/db_date'
-require 'doh/mysql/parse'
-require 'doh/mysql/to_sql'
 
 module DohDb
 
@@ -13,11 +11,4 @@ def self.current_datetime_db
   Doh::current_datetime(DohDb::now)
 end
 
-def self.server_datetime
-  retval = DohDb::select_field("SELECT #{DohDb::current_datetime_db.to_sql}")
-  # if there is a fake datetime right now, will need to parse it
-  retval = DohDb::parse_datetime(retval) if retval.is_a?(String)
-  retval
-end
-
 end

data/lib/doh/mysql/handle.rb

@@ -16,6 +16,9 @@ class Handle
 
   def initialize(config)
     @config = config
+    log_config = @config.dup
+    log_config.delete(:password)
+    dohlog.info("creating connection with config: #{log_config}")
     @mysqlh = Mysql2::Client.new(@config)
     dohlog.info("new connection created: id #{@mysqlh.thread_id}")
   end

data/lib/doh/mysql/metadata_util.rb

@@ -33,31 +33,6 @@ def self.field_exist?(table, field, database = nil)
   column_info(table, database).key?(field)
 end
 
-@@primary_keys = {}
-def self.find_primary_key(table, database = nil)
-  if table.index('.')
-    database = table.before('.')
-    table = table.after('.')
-  else
-    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}' AND ORDINAL_POSITION=1")
-    raise "no information found for database #{database}" if dbhash.empty?
-    @@primary_keys[database] = dbhash
-  end
-
-  retval = dbhash[table]
-  raise "attempting to find_primary_key for table that doesn't exist: #{database}.#{table}" if retval.nil?
-  retval
-end
-
-def self.table_exist?(table, database = nil)
-  !find_primary_key(table, database).nil?
-end
-
 def self.field_list(table, database = nil)
   column_info(table, database).keys
 end

data/lib/doh/mysql/smart_row.rb

@@ -1,20 +1,7 @@
-require 'doh/mysql/writable_row'
-require 'doh/to_display'
-require 'doh/mysql/virtual'
-require 'sqlstmt/update'
+require 'doh/mysql/abstract_row'
 
 module DohDb
 
-class RowDisplayProxy
-  def initialize(row)
-    @row = row
-  end
-
-  def method_missing(sym, *ignore_args)
-    @row.send(sym.to_s).to_display
-  end
-end
-
 class AbstractSmartRow < AbstractRow
   attr_accessor :table
   attr_reader :changed_keys
@@ -23,23 +10,12 @@ class AbstractSmartRow < AbstractRow
     @keys = keys.dup
     @values = values.dup
     @changed_keys = Set.new
-    @cached_virtuals = {}
   end
 
   def initialize_copy(orig)
     @keys = @keys.dup
     @values = @values.dup
     @changed_keys = @changed_keys.dup
-    @cached_virtuals = @cached_virtuals.dup
-    @display_proxy = nil
-  end
-
-  def display(key = nil)
-    if key.nil?
-      @display_proxy ||= RowDisplayProxy.new(self)
-    else
-      get(key).to_display
-    end
   end
 
   def set(key, value, flag_changed = true)
@@ -82,56 +58,14 @@ class AbstractSmartRow < AbstractRow
     @values.delete_at(index)
   end
 
-  def db_insert
-    newid = DohDb::insert_hash(self, @table)
-    if newid != 0
-      set(primary_key, newid, false)
-    end
-    newid
-  end
-
-  def db_update
-    return if @changed_keys.empty?
-    before_db_update
-    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
-  end
-
-protected
-  def primary_key
-    DohDb::find_primary_key(@table)
-  end
-
-  def before_db_update
-  end
-
-  def after_db_update
-  end
-
   def guess_missing_get(key)
     return get(key) if key?(key)
-    retval = get_virtual_field(key)
-    raise "unknown field: #{key}" unless retval
-    retval
+    raise "unknown field: #{key}"
   end
 
   def guess_missing_set(key, value)
     set(key, value)
   end
-
-  def get_virtual_field(name)
-    cached = @cached_virtuals[name]
-    return cached if cached
-    if idvalue = get(name + '_id')
-      @cached_virtuals[name] = DohDb::LinkedRow.build(name, idvalue.to_i)
-    else
-      nil
-    end
-  end
 end
 
 class SmartRow < AbstractSmartRow
@@ -144,11 +78,4 @@ class SmartRow < AbstractSmartRow
   end
 end
 
-class CustomSmartRow < AbstractSmartRow
-  def initialize(*args)
-    super(*parse_initialize_args(*args))
-    @table = self.class.default_table
-  end
-end
-
 end

data/test/metadata_util.dt.rb

@@ -42,12 +42,6 @@ class Test_metadata_util < DohTest::TestGroup
     assert_equal('blahbla', newrow['str'])
     assert_equal('blahblahblah', row['num'])
     assert_equal('blahblahblah', row['str'])
-
-    assert(DohDb::table_exist?(tbl))
-
-    assert_equal('num', DohDb::find_primary_key(tbl))
-    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
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: &70154500522900 !ruby/object:Gem::Requirement
+  requirement: &70181797597040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70154500522900
+  version_requirements: *70181797597040
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70154500522240 !ruby/object:Gem::Requirement
+  requirement: &70181797596320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70154500522240
+  version_requirements: *70181797596320
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70154500521540 !ruby/object:Gem::Requirement
+  requirement: &70181797595620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70154500521540
+  version_requirements: *70181797595620
 - !ruby/object:Gem::Dependency
   name: sqlstmt
-  requirement: &70154500520920 !ruby/object:Gem::Requirement
+  requirement: &70181797594820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70154500520920
+  version_requirements: *70181797594820
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70154500520300 !ruby/object:Gem::Requirement
+  requirement: &70181797594000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 0.1.7
   type: :development
   prerelease: false
-  version_requirements: *70154500520300
+  version_requirements: *70181797594000
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com
@@ -89,15 +89,11 @@ files:
 - lib/doh/mysql/hash_row.rb
 - lib/doh/mysql/load_sql.rb
 - lib/doh/mysql/metadata_util.rb
-- lib/doh/mysql/parse.rb
 - lib/doh/mysql/raw_row_builder.rb
 - lib/doh/mysql/readonly_row.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/virtual.rb
 - lib/doh/mysql/writable_row.rb
 - lib/doh/mysql.rb
 - test/cache_connector.dt.rb
@@ -105,12 +101,9 @@ files:
 - 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/typecasting.dt.rb
-- test/unquoted.dt.rb
 - test/writable_row.dt.rb
 - MIT-LICENSE
 homepage: https://github.com/atpsoft/dohmysql
@@ -144,11 +137,8 @@ test_files:
 - 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/typecasting.dt.rb
-- test/unquoted.dt.rb
 - test/writable_row.dt.rb
 has_rdoc: 

data/lib/doh/mysql/parse.rb

@@ -1,36 +0,0 @@
-require 'bigdecimal'
-require 'date'
-
-module DohDb
-
-def self.parse_bool(str)
-  if str == '0'
-    false
-  elsif str == '1'
-    true
-  else
-    raise ArgumentError.new("unexpected value: " + str)
-  end
-end
-
-def self.parse_datetime(str)
-  raise ArgumentError.new("unexpected value: " + str) unless str.size == 19
-  return nil if str == '0000-00-00 00:00:00'
-  DateTime.parse(str)
-end
-
-def self.parse_date(str)
-  raise ArgumentError.new("unexpected value: " + str) unless str.size == 10
-  return nil if str == '0000-00-00'
-  Date.new(str[0..3].to_i, str[5..6].to_i, str[8..9].to_i)
-end
-
-def self.parse_decimal(str)
-  BigDecimal(str)
-end
-
-def self.parse_int(str)
-  str.to_i
-end
-
-end

data/lib/doh/mysql/types.rb

@@ -1,12 +0,0 @@
-module DohDb
-
-@@row_types = {}
-def self.register_row_type(table, klass)
-  @@row_types[table] = klass
-end
-
-def self.find_row_type(table)
-  @@row_types[table]
-end
-
-end

data/lib/doh/mysql/unquoted.rb

@@ -1,17 +0,0 @@
-module DohDb
-
-class Unquoted < String
-  def to_sql
-    to_s
-  end
-end
-
-def self.unquoted(str)
-  Unquoted.new(str)
-end
-
-NOW = Unquoted.new('NOW()').freeze
-TODAY = Unquoted.new('CURDATE()').freeze
-NULL = Unquoted.new('NULL').freeze
-
-end

data/lib/doh/mysql/virtual.rb

@@ -1,17 +0,0 @@
-require 'doh/mysql/metadata_util'
-require 'doh/mysql/readonly_row'
-require 'doh/mysql/types'
-
-module DohDb
-
-class LinkedRow
-  def self.build(field, idvalue)
-    return ReadOnlyRow.new([], []) if idvalue.to_i == 0
-    table = field.sub(/_id/, '')
-    table = table.rafter('_') unless DohDb::table_exist?(table)
-    raise "unable to determine child table name for field #{field}" unless DohDb::table_exist?(table)
-    DohDb::select_row("SELECT * FROM #{table} WHERE #{DohDb::find_primary_key(table)} = #{idvalue}", DohDb::find_row_type(table) || :smart)
-  end
-end
-
-end

data/test/parse.dt.rb

@@ -1,39 +0,0 @@
-require 'doh/mysql/parse'
-
-module DohDb
-
-class Test_Parse < DohTest::TestGroup
-  def test_bool
-    assert_equal(false, DohDb::parse_bool('0'))
-    assert_equal(true, DohDb::parse_bool('1'))
-    assert_raises(ArgumentError) {DohDb::parse_bool('blah')}
-  end
-
-  def test_date
-    assert_raises(ArgumentError) {DohDb::parse_date('blah')}
-    assert_equal(Date.new(2008,2,14), DohDb::parse_date('2008-02-14'))
-    assert_raises(ArgumentError) {DohDb::parse_date('20080214')}
-    assert_not_equal(Date.new(2008,2,14), DohDb::parse_date('2008-02-15'))
-    assert_equal(nil, DohDb::parse_date('0000-00-00'))
-  end
-
-  def test_datetime
-    assert_raises(ArgumentError) {DohDb::parse_date('blah')}
-    assert_raises(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'))
-    assert_equal(nil, DohDb::parse_datetime('0000-00-00 00:00:00'))
-  end
-
-  def test_decimal
-    assert_equal(BigDecimal.new('3.14'), DohDb::parse_decimal('3.14'))
-    assert_equal(BigDecimal.new('0.0'), DohDb::parse_decimal('sjdkflsdjl'))
-  end
-
-  def test_int
-    assert_equal(3, DohDb::parse_int('3'))
-    assert_equal(0, DohDb::parse_int('sjdkflsdjl'))
-  end
-end
-
-end

data/test/smart_row.dt.rb

@@ -1,21 +0,0 @@
-require 'doh/mysql/smart_row'
-
-module DohDb
-
-class Test_SmartRow < DohTest::TestGroup
-  def test_display
-    row = SmartRow.new(['flag'], [true])
-    assert_equal('', row.display('this_field_doesnt_exist'))
-    assert_raises(RuntimeError) { row.display.this_field_doesnt_exist }
-    assert_equal('yes', row.display('flag'))
-    assert_equal('yes', row.display.flag)
-    row2 = row.dup
-    assert_equal(true, row2.flag)
-    row2.flag = false
-    assert_equal(false, row2.flag)
-    assert_equal(true, row.flag)
-    assert_raises(RuntimeError) { row.this_field_doesnt_exist }
-  end
-end
-
-end

data/test/unquoted.dt.rb

@@ -1,16 +0,0 @@
-require 'doh/mysql/unquoted'
-
-module DohDb
-
-class Test_Unquoted < DohTest::TestGroup
-  def test_stuff
-    assert_equal('', Unquoted.new)
-    assert_equal('blah', Unquoted.new('blah'))
-    assert_equal('blah', Unquoted.new('blah').to_s)
-    assert_equal('blah', Unquoted.new('blah').to_sql)
-    assert_equal('SELECT * FROM blah WHERE smoe = NULL', "SELECT * FROM blah WHERE smoe = #{DohDb::NULL.to_sql}")
-  end
-end
-
-end
-