dohmysql 0.2.5 → 0.2.6

data/lib/doh/mysql/database_creator.rb

@@ -67,12 +67,12 @@ private
     files = [sql_filename(database, 'tables', table_name)]
     inserts_file = sql_filename(database, 'inserts', table_name)
     files.push(inserts_file) if File.exist?(inserts_file)
-    DohDb.load_sql(dbh.config, files)
+    load_sql(dbh, 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)])
+    load_sql(dbh, [sql_filename(database, 'views', view_name)])
   end
 
   def create_one_database(dbh, dest_db, source_db, drop_first, include_migrates)
@@ -86,11 +86,23 @@ private
     @connector.config[:database] = dest_db
 
     files = find_files("#{source_db}/tables/*.sql") + find_files("#{source_db}/inserts/*.sql") + view_files(source_db)
-    DohDb.load_sql(@connector.config, files)
+    load_sql(dbh, files)
     run_scripts(source_db) if @include_scripts
     apply_migrates(dbh, source_db) if include_migrates
   end
 
+  def load_sql(dbh, files)
+    files.each do |filename|
+      contents = File.read(filename)
+      queries = contents.split(/;$/)
+      queries.each do |str|
+        str.strip!
+        next if str.empty?
+        dbh.query(str)
+      end
+    end
+  end
+
   def apply_migrates(dbh, source_db)
     apply_files = find_files("#{source_db}/migrate/*_apply.sql")
     migrates = apply_files.collect {|path| File.basename(path).slice(0..-11)}
@@ -105,7 +117,7 @@ private
       end
     end
 
-    DohDb.load_sql(@connector.config, apply_files)
+    load_sql(dbh, apply_files)
     apply_files.each do |path|
       migrate_name = File.basename(path).slice(0..-11)
       contents = File.open(path) {|file| file.read}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177766394020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+  version_requirements: *70177766394020
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177766393540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+  version_requirements: *70177766393540
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177766393060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.11
+  version_requirements: *70177766393060
 - !ruby/object:Gem::Dependency
   name: sqlstmt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177766392560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+  version_requirements: *70177766392560
 - !ruby/object:Gem::Dependency
   name: dohtest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70177766392080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,12 +66,7 @@ dependencies:
         version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.8
+  version_requirements: *70177766392080
 description: wrapper classes around low level mysql gem to provide a better interface
 email:
 - devinfo@atpsoft.com
@@ -158,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: friendly mysql client interface
@@ -173,4 +148,3 @@ test_files:
 - test/to_sql.dt.rb
 - test/typecasting.dt.rb
 - test/writable_row.dt.rb
-has_rdoc: