dohmysql 0.1.1 → 0.1.2

data/lib/doh/mysql/activate.rb

@@ -12,11 +12,6 @@ def self.activate
   root_cfg = Doh::config
   return unless root_cfg.fetch('enable_database', true)
   return unless root_cfg.key?('database')
-  begin
-    require 'mysql'
-  rescue LoadError => e
-    return
-  end
   db_cfg = root_cfg['database']
   require 'doh/mysql'
   require 'doh/mysql/require_dbtypes'

data/lib/doh/mysql/current_date.rb

@@ -1,6 +1,7 @@
 require 'doh/current_date'
 require 'doh/mysql/db_date'
 require 'doh/mysql/parse'
+require 'doh/mysql/to_sql'
 
 module DohDb
 

data/lib/doh/mysql/database_creator.rb

@@ -19,7 +19,6 @@ class DatabaseCreator
 
   def create_database_copy(dest_db, source_db, drop_first = false)
     create_one_database(get_nodb_handle, dest_db, source_db, drop_first)
-    DohDb::link_database_types(dest_db, source_db)
   end
 
   def create_all_databases(drop_first = false)

data/lib/doh/mysql/handle.rb

@@ -5,6 +5,7 @@ require 'doh/mysql/typed_row_builder'
 require 'doh/mysql/writable_row'
 require 'doh/mysql/hash_row'
 require 'doh/mysql/smart_row'
+require 'doh/mysql/to_sql'
 
 module DohDb
 

data/lib/doh/mysql/raw_row_builder.rb

@@ -1,4 +1,3 @@
-require 'mysql'
 require 'doh/mysql/readonly_row'
 
 module DohDb

data/lib/doh/mysql/to_sql.rb

@@ -1,71 +1,8 @@
-require 'bigdecimal'
-require 'date'
-begin
-  require 'mysql'
-  $mysql_loaded = true
-rescue
-  $mysql_loaded = false
-end
-
-class Object
-  def to_sql
-    if $mysql_loaded
-      str = Mysql.escape_string(to_s)
-    else
-      str = non_mysql_escape_string
-    end
-    '"' + str + '"'
-  end
-private
-  def non_mysql_escape_string
-    str.gsub('\\', '\\\\').gsub('\'', '\\\'').gsub('"', '\\"')
-  end
-end
-
-class NilClass
-  def to_sql
-    'NULL'
-  end
-end
-
-class Numeric
-  def to_sql
-    to_s
-  end
-end
-
-class DateTime
-  def to_sql
-    '"' + strftime('%Y-%m-%d %H:%M:%S') + '"'
-  end
-end
-
-class Time
-  def to_sql
-    '"' + strftime('%Y-%m-%d %H:%M:%S') + '"'
-  end
-end
-
-class TrueClass
-  def to_sql
-    '1'
-  end
-end
-
-class FalseClass
-  def to_sql
-    '0'
-  end
-end
-
-class BigDecimal
-  def to_sql
-    to_s('F')
-  end
-end
+require 'sqlstmt/to_sql'
+require 'mysql2'
 
-class Array
+class String
   def to_sql
-    '(' + collect { |elem| elem.to_sql }.join(',') + ')'
+    "'#{Mysql2::Client.escape(to_s)}'"
   end
 end

data/lib/doh/mysql/types.rb

@@ -1,26 +1,5 @@
 module DohDb
 
-@@column_types = {}
-def self.register_column_type(database, table, column, klass)
-  database = '__global__' # until database support is available
-  @@column_types[database] ||= {}
-  table = '__global__' if table.nil?
-  @@column_types[database][table] ||= {}
-  @@column_types[database][table][column] = klass
-end
-
-def self.find_column_type(database, table, column)
-  database = '__global__' # until database support is available
-  db_hash = @@column_types[database]; return nil unless db_hash
-  table = '__global__' if table.nil?
-  table_hash = db_hash[table]; return nil unless table_hash
-  table_hash[column]
-end
-
-def self.link_database_types(dest_db, source_db)
-  @@column_types[dest_db] = @@column_types[source_db]
-end
-
 @@row_types = {}
 def self.register_row_type(table, klass)
   @@row_types[table] = klass

data/test/to_sql.dt.rb

@@ -4,14 +4,7 @@ module DohDb
 
 class Test_to_sql < DohTest::TestGroup
   def test_stuff
-    assert_equal('"blah"', 'blah'.to_sql)
-    assert_equal('NULL', nil.to_sql)
-    assert_equal('3', 3.to_sql)
-    assert_equal('"2008-09-24 09:30:04"', DateTime.new(2008,9,24,9,30,4).to_sql)
-    assert_equal('1', true.to_sql)
-    assert_equal('0', false.to_sql)
-    assert_equal('10.0', BigDecimal.new('10').to_sql)
-    assert_equal('("a","b","c")', ['a', 'b', 'c'].to_sql)
+    assert_equal("'blah'", 'blah'.to_sql)
   end
 end
 

data/test/types.dt.rb

@@ -20,7 +20,7 @@ class Test_types < DohTest::TestGroup
     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(DateTime.new(2012,2,20, 21, 6, 0).utc, 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.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70236167835480 !ruby/object:Gem::Requirement
+  requirement: &70362932067240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70236167835480
+  version_requirements: *70362932067240
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70236167834600 !ruby/object:Gem::Requirement
+  requirement: &70362932066660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,21 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70236167834600
+  version_requirements: *70362932066660
+- !ruby/object:Gem::Dependency
+  name: sqlstmt
+  requirement: &70362932065940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70362932065940
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70236167833680 !ruby/object:Gem::Requirement
+  requirement: &70362932065220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +55,7 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *70236167833680
+  version_requirements: *70362932065220
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com