dohmysql 0.1.5 → 0.1.6

data/bin/makedb

@@ -5,7 +5,7 @@ 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[:default_database], "-d", "--database <database>", "name of the source database -- defaults to Doh::config[:default_database], currently '#{Doh::config[:default_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' => [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/connector_instance.rb

@@ -8,76 +8,12 @@ def self.connector_instance
   @@connector_instance
 end
 
-def self.request_handle
-  connector_instance.request_handle
 end
 
-def self.query(statement)
-  request_handle.query(statement)
-end
-
-def self.update(statement)
-  request_handle.update(statement)
-end
-
-def self.update_row(statement)
-  request_handle.update_row(statement)
-end
-
-def self.update_hash(hash, table, primary_key_value, primary_key_name)
-  request_handle.update_hash(hash, table, primary_key_value, primary_key_name)
-end
-
-def self.insert(statement)
-  request_handle.insert(statement)
-end
-
-def self.insert_hash(hash, table, quote_strings = true)
-  request_handle.insert_hash(hash, table, quote_strings)
-end
-
-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)
-  request_handle.select(statement, row_builder)
-end
-
-def self.select_row(statement, row_builder = nil)
-  request_handle.select_row(statement, row_builder)
-end
-
-def self.select_optional_row(statement, row_builder = nil)
-  request_handle.select_optional_row(statement, row_builder)
-end
-
-def self.select_field(statement, row_builder = nil)
-  request_handle.select_field(statement, row_builder)
-end
-
-def self.select_optional_field(statement, row_builder = nil)
-  request_handle.select_optional_field(statement, row_builder)
-end
-
-def self.select_transpose(statement, row_builder = nil)
-  request_handle.select_transpose(statement, row_builder)
-end
-
-def self.select_values(statement, row_builder = nil)
-  request_handle.select_values(statement, row_builder)
-end
-
-def self.select_list(statement, row_builder = nil)
-  request_handle.select_list(statement, row_builder)
-end
+module Doh
 
-def self.multi_select(statements)
-  request_handle.multi_select(statements)
+def self.db
+  DohDb.connector_instance.request_handle
 end
 
 end

data/lib/doh/mysql/connector_util.rb

@@ -15,7 +15,7 @@ def self.drop_create_and_connect(connector, new_default_database = nil)
 end
 
 def self.reconfigure_connector(cfg, connector = nil)
-  connector ||= DohDb::connector_instance
+  connector ||= DohDb.connector_instance
   connector.reset
   connector.host = cfg['host'] if cfg.key?('host')
   connector.username = cfg['username'] if cfg.key?('username')

data/lib/doh/mysql/current_date.rb

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

data/lib/doh/mysql/database_creator.rb

@@ -7,8 +7,8 @@ module DohDb
 
 class DatabaseCreator
   def initialize(sqlfiles_directory = nil, connector = nil)
-    @sqlfiles_directory = sqlfiles_directory || File.join(Doh::root, 'database')
-    @connector = connector || DohDb::connector_instance
+    @sqlfiles_directory = sqlfiles_directory || File.join(Doh.root, 'database')
+    @connector = connector || DohDb.connector_instance
     @include_scripts = true
   end
 
@@ -66,12 +66,12 @@ private
     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(dbh.config, files)
+    DohDb.load_sql(dbh.config, files)
   end
 
   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)])
+    DohDb.load_sql(dbh.config, [sql_filename(database, 'views', view_name)])
   end
 
   def create_one_database(dbh, dest_db, source_db, drop_first)
@@ -84,7 +84,7 @@ private
     @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.config, files)
+    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/handle.rb

@@ -130,10 +130,10 @@ class Handle
     if field_count < 2
       raise UnexpectedQueryResult, "must select at least 2 fields in order to transpose"
     elsif field_count == 2
-      Doh::array_to_hash(rows) { |row| [row.at(0), row.at(1)] }
+      Doh.array_to_hash(rows) { |row| [row.at(0), row.at(1)] }
     else
       key_field = rows.first.keys.first
-      Doh::array_to_hash(rows) do |row|
+      Doh.array_to_hash(rows) do |row|
         value = row.to_h
         value.delete(key_field)
         [row.at(0), value]

data/lib/doh/mysql/load_sql.rb

@@ -8,7 +8,7 @@ end
 
 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+')
+  io = IO.popen(mysqlcmd, 'r+')
   dohlog.debug("loading sql file: " + filenames.first) if filenames.size == 1
   filenames.each do |elem|
     open(elem) {|file| io << file.read}

data/lib/doh/mysql/metadata_util.rb

@@ -4,11 +4,11 @@ module DohDb
 
 @@cached_column_info = {}
 def self.column_info(table, database = nil)
-  database ||= DohDb::connector_instance.config[: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}' AND TABLE_NAME='#{table}'"
-  @@cached_column_info[lookup_str] = DohDb::select_transpose(stmt)
+  @@cached_column_info[lookup_str] = Doh.db.select_transpose(stmt)
 end
 
 def self.field_character_size(table, field, database = nil)
@@ -39,9 +39,9 @@ end
 
 @@tables_by_database = {}
 def self.all_tables(database = nil)
-  database ||= DohDb::connector_instance.config[: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}'")
+    @@tables_by_database[database] ||= Doh.db.select_list("SELECT table_name FROM information_schema.tables WHERE table_schema = '#{database}'")
 end
 
 end

data/test/connector_instance.dt.rb

@@ -6,26 +6,26 @@ module DohDb
 class Test_ConnectorInstance < DohTest::TestGroup
   def test_stuff
     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)"))
-    assert_equal(1, DohDb::update("UPDATE #{tbl} SET money = 10.8 WHERE id = 1"))
-    assert_equal(BigDecimal('10.80'), DohDb::select_field("SELECT money FROM #{tbl} WHERE id = 1"))
-    assert_raises(UnexpectedQueryResult) {DohDb::select_row("SELECT * FROM #{tbl} WHERE id = 7")}
-    assert_equal(nil, DohDb::select_optional_row("SELECT * FROM #{tbl} WHERE id = 7"))
-    assert_raises(UnexpectedQueryResult){DohDb::select_optional_row("SELECT * FROM #{tbl} WHERE id < 3")}
-    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(Mysql2::Error){DohDb::query("some invalid sql here")}
+    Doh.db.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, Doh.db.insert("INSERT INTO #{tbl} (id, created_on, created_at, money) VALUES (null, CURDATE(), '2007-01-01 10:30:05', 10.5)"))
+    assert_equal(2, Doh.db.insert("INSERT INTO #{tbl} (id, created_on) VALUES (null, 0)"))
+    assert_equal(1, Doh.db.update("UPDATE #{tbl} SET money = 10.8 WHERE id = 1"))
+    assert_equal(BigDecimal('10.80'), Doh.db.select_field("SELECT money FROM #{tbl} WHERE id = 1"))
+    assert_raises(UnexpectedQueryResult) {Doh.db.select_row("SELECT * FROM #{tbl} WHERE id = 7")}
+    assert_equal(nil, Doh.db.select_optional_row("SELECT * FROM #{tbl} WHERE id = 7"))
+    assert_raises(UnexpectedQueryResult){Doh.db.select_optional_row("SELECT * FROM #{tbl} WHERE id < 3")}
+    assert_equal(nil, Doh.db.select_optional_field("SELECT money FROM #{tbl} WHERE id = 7"))
+    assert_raises(UnexpectedQueryResult) {Doh.db.select_field("SELECT money FROM #{tbl} WHERE id = 7")}
+    assert_equal(1, Doh.db.update_row("UPDATE #{tbl} SET money = 10.95 WHERE id = 1"))
+    assert_raises(Mysql2::Error){Doh.db.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")}
-    onerow = DohDb::select_row("SELECT * FROM #{tbl} WHERE id = 1")
+    assert_raises(UnexpectedQueryResult) {Doh.db.update_row("UPDATE #{tbl} SET money = 10.95 WHERE id = 7")}
+    onerow = Doh.db.select_row("SELECT * FROM #{tbl} WHERE id = 1")
     assert_equal(1, onerow['id'])
-    onerow = DohDb::select_optional_row("SELECT * FROM #{tbl} WHERE id = 1")
+    onerow = Doh.db.select_optional_row("SELECT * FROM #{tbl} WHERE id = 1")
     assert_equal(1, onerow['id'])
-    rows = DohDb::select("SELECT * FROM #{tbl}")
+    rows = Doh.db.select("SELECT * FROM #{tbl}")
     rows.each {|row| assert(row['id'] != 0)}
   end
 end

data/test/helpers.rb

@@ -23,7 +23,7 @@ module InternalTestHelpers
   def init_global_connector
     require 'doh/mysql/connector_instance'
     require 'doh/mysql/cache_connector'
-    DohDb::set_connector_instance(DohDb::CacheConnector.new(dbcfg))
+    DohDb.set_connector_instance(DohDb::CacheConnector.new(dbcfg))
   end
 end
 

data/test/metadata_util.dt.rb

@@ -20,7 +20,7 @@ class Test_metadata_util < DohTest::TestGroup
   def test_stuff
     dbh = get_dbh
     dbh.query("CREATE TABLE #{tbl} (num INT, str CHAR(7))")
-    column_info = DohDb::column_info(tbl)
+    column_info = DohDb.column_info(tbl)
     info = column_info['str']
     assert_equal('char', info['data_type'])
     assert_equal(7, info['character_maximum_length'])
@@ -28,16 +28,16 @@ class Test_metadata_util < DohTest::TestGroup
     assert_equal('int', info['data_type'])
     assert_equal(nil, info['character_maximum_length'])
 
-    assert_equal(7, DohDb::field_character_size(tbl, 'str'))
-    assert_equal(nil, DohDb::field_character_size(tbl, 'num'))
+    assert_equal(7, DohDb.field_character_size(tbl, 'str'))
+    assert_equal(nil, DohDb.field_character_size(tbl, 'num'))
 
     row = {'num' => 'blahblahblah', 'str' => 'blahblahblah'}
-    DohDb::chop_character_fields!(tbl, row)
+    DohDb.chop_character_fields!(tbl, row)
     assert_equal('blahblahblah', row['num'])
     assert_equal('blahbla', row['str'])
 
     row = {'num' => 'blahblahblah', 'str' => 'blahblahblah'}
-    newrow = DohDb::chop_character_fields(tbl, row)
+    newrow = DohDb.chop_character_fields(tbl, row)
     assert_equal('blahblahblah', newrow['num'])
     assert_equal('blahbla', newrow['str'])
     assert_equal('blahblahblah', row['num'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: &70242076304200 !ruby/object:Gem::Requirement
+  requirement: &70363389961120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70242076304200
+  version_requirements: *70363389961120
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70242076279100 !ruby/object:Gem::Requirement
+  requirement: &70363389960520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70242076279100
+  version_requirements: *70363389960520
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70242076275220 !ruby/object:Gem::Requirement
+  requirement: &70363389959920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70242076275220
+  version_requirements: *70363389959920
 - !ruby/object:Gem::Dependency
   name: sqlstmt
-  requirement: &70242076249640 !ruby/object:Gem::Requirement
+  requirement: &70363389959340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70242076249640
+  version_requirements: *70363389959340
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: &70242076246900 !ruby/object:Gem::Requirement
+  requirement: &70363389933500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *70242076246900
+  version_requirements: *70363389933500
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com