squealer 2.1.1 → 2.2.0

data/spec/squealer/target_spec.rb

@@ -4,23 +4,28 @@ describe Squealer::Target do
   let(:table_name) { :test_table }
   let(:test_table) { {'_id' => 0} }
 
-  let(:export_dbc) { mock(Mysql) }
+  let(:upsertable?) { Squealer::Database.instance.upsertable? }
 
   after(:each) { Squealer::Target::Queue.instance.clear }
 
-
   context "targeting" do
     describe "initialize" do
-      let(:faqs) { [{'_id' => 123}] }
+      let(:faqs) { [{'_id' => '123'}] }
+      let(:naqs) { [{:_id => 'abc'}] }
 
       context "without a target row id" do
         context "with the inferred variable in scope" do
           it "infers the value from the _id field in the hashmap referenced by the variable" do
-            mock_mysql
-
             faqs.each do |faq|
-              Squealer::Target.new(nil, :faq) do |target|
-                target.send(:instance_variable_get, '@row_id').should == faq['_id']
+              Squealer::TestTarget.new(nil, :faq) do |target|
+                target.instance_variable_get('@row_id').should == faq['_id']
+              end
+            end
+          end
+          it "infers the value from the :_id field in the hashmap referenced by the variable" do
+            naqs.each do |naq|
+              Squealer::TestTarget.new(nil, :naq) do |target|
+                target.instance_variable_get('@row_id').should == naq[:_id]
               end
             end
           end
@@ -29,7 +34,7 @@ describe Squealer::Target do
             it "throws an argument error" do
               hash_with_no_id = {}
               lambda do
-                Squealer::Target.new(nil, :hash_with_no_id) {}
+                Squealer::TestTarget.new(nil, :hash_with_no_id) {}
               end.should raise_error(ArgumentError)
             end
           end
@@ -38,7 +43,7 @@ describe Squealer::Target do
             it "throws an argument error" do
               not_a_hash = nil
               lambda do
-                Squealer::Target.new(nil, :not_a_hash) {}
+                Squealer::TestTarget.new(nil, :not_a_hash) {}
               end.should raise_error(ArgumentError)
             end
           end
@@ -47,36 +52,23 @@ describe Squealer::Target do
         context "without the inferred variable in scope" do
           it "throws a name error" do
             lambda do
-              Squealer::Target.new(nil, :missing_variable) {}
+              Squealer::TestTarget.new(nil, :missing_variable) {}
             end.should raise_error(NameError)
           end
         end
       end
-
-      context "with a target row id" do
-        it "uses the passed value" do
-          mock_mysql
-
-          faqs.each do |faq|
-            Squealer::Target.new(nil, :faq, 1) do |target|
-              target.send(:instance_variable_get, '@row_id').should == 1
-            end
-          end
-        end
-      end
     end
   end
 
 
   context "nesting" do
     it "pushes itself onto the targets stack when starting" do
-      mock_mysql
       @target1 = @target2 = nil
 
-      target1 = Squealer::Target.new(export_dbc, table_name) do
+      target1 = Squealer::TestTarget.new(nil, table_name) do
         @target1 = Squealer::Target.current
         test_table_2 = test_table
-        Squealer::Target.new(export_dbc, "#{table_name}_2") do
+        Squealer::TestTarget.new(nil, "#{table_name}_2") do
           @target2 = Squealer::Target.current
           @target2.should_not == @target1
         end
@@ -85,9 +77,7 @@ describe Squealer::Target do
     end
 
     it "pops itself off the targets stack when finished" do
-      mock_mysql
-
-      Squealer::Target.new(export_dbc, table_name) { nil }
+      Squealer::TestTarget.new(nil, table_name) { nil }
       Squealer::Target.current.should be_nil
     end
   end
@@ -95,21 +85,17 @@ describe Squealer::Target do
 
   context "yielding" do
     it "yields" do
-      mock_mysql
-
       block_done = false
-      target = Squealer::Target.new(export_dbc, table_name) { block_done = true }
+      target = Squealer::TestTarget.new(nil, table_name) { block_done = true }
       block_done.should be_true
     end
 
     it "yields inner blocks before executing its own SQL" do
-      mock_mysql
-
       blocks_done = []
-      Squealer::Target.new(export_dbc, table_name) do |target_1|
+      Squealer::TestTarget.new(nil, table_name) do |target_1|
         blocks_done << target_1
         blocks_done.first.sql.should be_empty
-        Squealer::Target.new(export_dbc, table_name) do |target_2|
+        Squealer::TestTarget.new(nil, table_name) do |target_2|
           blocks_done << target_2
           blocks_done.first.sql.should be_empty
           blocks_done.last.sql.should be_empty
@@ -132,10 +118,8 @@ describe Squealer::Target do
 
       context "with a block" do
         it "uses the value from the block" do
-          mock_mysql
-
           faqs.each do |faq|
-            Squealer::Target.new(nil, :faq) do
+            Squealer::TestTarget.new(nil, :faq) do
               assign(col1) { value1 }
               Squealer::Target.current.instance_variable_get('@column_names').should == [col1]
               Squealer::Target.current.instance_variable_get('@column_values').should == [value1]
@@ -143,10 +127,8 @@ describe Squealer::Target do
           end
         end
         it "uses the value from the block even if it is nil" do
-          mock_mysql
-
           faqs.each do |faq|
-            Squealer::Target.new(nil, :faq) do
+            Squealer::TestTarget.new(nil, :faq) do
               assign(col1) { nil }
               Squealer::Target.current.instance_variable_get('@column_names').should == [col1]
               Squealer::Target.current.instance_variable_get('@column_values').should == [nil]
@@ -158,10 +140,8 @@ describe Squealer::Target do
       context "without a block" do
         context "with the inferred variable in scope" do
           it "infers source from target name" do
-            mock_mysql
-
             faqs.each do |faq|
-              Squealer::Target.new(nil, :faq) do
+              Squealer::TestTarget.new(nil, :faq) do
                 assign(col1)
                 Squealer::Target.current.instance_variable_get('@column_names').should == [col1]
                 Squealer::Target.current.instance_variable_get('@column_values').should == [value1]
@@ -169,11 +149,9 @@ describe Squealer::Target do
             end
           end
           it "infers related source from target name" do
-            mock_mysql
-
             askers.each do |asker|
               faqs.each do |faq|
-                Squealer::Target.new(nil, :faq) do
+                Squealer::TestTarget.new(nil, :faq) do
                   assign(:asker_id)
                   Squealer::Target.current.instance_variable_get('@column_names').should == [:asker_id]
                   Squealer::Target.current.instance_variable_get('@column_values').should == [2001]
@@ -186,10 +164,8 @@ describe Squealer::Target do
 
       context "with an empty block" do
         it "assumes nil" do
-          mock_mysql
-
           faqs.each do |faq|
-            Squealer::Target.new(nil, :faq) do
+            Squealer::TestTarget.new(nil, :faq) do
               assign(col1) {}
               Squealer::Target.current.instance_variable_get('@column_names').should == [col1]
               Squealer::Target.current.instance_variable_get('@column_values').should == [nil]
@@ -202,113 +178,106 @@ describe Squealer::Target do
 
 
   context "exporting" do
-    before(:each) { mock_mysql }
-
     it "sends the sql to the export database" do
-      Squealer::Target.new(export_dbc, table_name) { nil }
+      Squealer::TestTarget.new(nil, table_name) { nil }
     end
 
     describe "#target" do
       describe "#typecast_values" do
         subject { target.send(:typecast_values) }
-        let(:target) { Squealer::Target.new(export_dbc, table_name) {} }
+        let(:target) { Squealer::TestTarget.new(nil, table_name) {} }
 
         it "casts array to comma-separated string" do
           target.assign(:colA) { ['1', '2'] }
           subject.should == ['1,2']
         end
-
-        it "casts false to 0 (for mysql TINYINT)" do
-          target.assign(:colA) { false }
-          subject.should == [0]
-        end
-
-        it "casts true to 1 (for mysql TINYINT)" do
-          target.assign(:colA) { true }
-          subject.should == [1]
-        end
-
-        it "casts symbol to string" do
-          target.assign(:colA) { :open }
-          subject.should == ['open']
-        end
       end
 
       context "generates SQL command strings" do
-        let(:target) { Squealer::Target.new(export_dbc, table_name) { nil } }
+        let(:target) { Squealer::TestTarget.new(nil, table_name) { nil } }
 
-        it "targets the table" do
-          target.sql.should =~ /^INSERT #{table_name} /
-        end
+        context "insert" do
+          it "targets the table" do
+            target.sql.should =~ /^INSERT INTO "#{table_name}" / if upsertable?
+            target.sql.should =~ /; INSERT INTO "#{table_name}" / unless upsertable?
+          end
 
-        it "uses an INSERT ... ON DUPLICATE KEY UPDATE statement" do
-          target.sql.should =~ /^INSERT .* ON DUPLICATE KEY UPDATE /
-        end
+          it "includes the primary key name in the INSERT" do
+            target.sql.should =~ / \(id\) VALUES/
+          end
 
-        it "includes the primary key name in the INSERT" do
-          target.sql.should =~ / \(id\) VALUES/
+          it "includes the primary key value in the INSERT" do
+            target.sql.should =~ / VALUES \('0'\)/
+          end
         end
 
-        it "includes the primary key value in the INSERT" do
-          # target.sql.should =~ / VALUES \('#{row_id}'\) /
-          target.sql.should =~ / VALUES \(\?\) /
+        context "upsert" do
+          before { Squealer::Database.instance.should_receive(:upsertable?).at_least(:once).and_return(true) }
+          it "uses an INSERT ... ON DUPLICATE KEY UPDATE statement" do
+            target.sql.should =~ /^INSERT INTO .* ON DUPLICATE KEY UPDATE /
+          end
         end
-
       end
 
       context "with 2 columns" do
         let(:value_1) { 42 }
         let(:target) do
-          Squealer::Target.new(export_dbc, table_name) { Squealer::Target.current.assign(:colA) { value_1 } }
+          Squealer::TestTarget.new(nil, table_name) { Squealer::Target.current.assign(:colA) { value_1 } }
         end
 
-        it "includes the column name in the INSERT" do
-          target.sql.should =~ /\(id,`colA`\) VALUES/
-        end
+        context "insert" do
+          it "includes the column name in the INSERT" do
+            target.sql.should =~ /\(id,"colA"\) VALUES/
+          end
 
-        it "includes the column value in the INSERT" do
-          # target.sql.should =~ /VALUES \('#{row_id}','#{value_1}'\)/
-          target.sql.should =~ /VALUES \(\?,\?\)/
+          it "includes the column value in the INSERT" do
+            target.sql.should =~ /VALUES \('0',\?\)/
+          end
         end
 
-        it "includes the column name and value in the UPDATE" do
-          # target.sql.should =~ /UPDATE colA='#{value_1}'/
-          target.sql.should =~ /UPDATE `colA`=\?/
+        context "upsert" do
+          before { Squealer::Database.instance.should_receive(:upsertable?).at_least(:once).and_return(true) }
+          it "includes the column name and value in the UPDATE" do
+            target.sql.should =~ /UPDATE "colA"=\?/
+          end
         end
-
       end
 
       context "with 3 columns" do
         let(:value_1) { 42 }
         let(:value_2) { 'foobar' }
         let(:target) do
-          Squealer::Target.new(export_dbc, table_name) do
+          Squealer::TestTarget.new(nil, table_name) do |target|
             Squealer::Target.current.assign(:colA) { value_1 }
             Squealer::Target.current.assign(:colB) { value_2 }
           end
         end
 
-        it "includes the column names in the INSERT" do
-          target.sql.should =~ /\(id,`colA`,`colB`\) VALUES/
-        end
+        context "insert" do
+          it "includes the column names in the INSERT" do
+            target.sql.should =~ /\(id,"colA","colB"\) VALUES/
+          end
 
-        it "includes the column values in the INSERT" do
-          # target.sql.should =~ /VALUES \('#{row_id}','#{value_1}','#{value_2}'\)/
-          target.sql.should =~ /VALUES \(\?,\?,\?\)/
+          it "includes the column values in the INSERT" do
+            target.sql.should =~ /VALUES \('0',\?,\?\)/
+          end
         end
 
-        it "includes the column names and values in the UPDATE" do
-          # target.sql.should =~ /UPDATE colA='#{value_1}',colB='#{value_2}'/
-          target.sql.should =~ /UPDATE `colA`=\?,`colB`=\?/
+        context "upsert" do
+          before { Squealer::Database.instance.should_receive(:upsertable?).at_least(:once).and_return(true) }
+          it "includes the column names and values in the UPDATE" do
+            target.sql.should =~ /UPDATE "colA"=\?,"colB"=\?/
+          end
         end
       end
     end
   end
 end
 
-def mock_mysql
-  Squealer::Database.instance.should_receive(:export).at_least(:once).and_return(export_dbc)
-  st = mock(Mysql::Stmt)
-  export_dbc.should_receive(:prepare).at_least(:once).and_return(st)
-  st.should_receive(:execute).at_least(:once)
+# Yes, David Chelimsky, an any_instance stub would be handy right about now :-P
+module Squealer
+  class TestTarget < Target
+    def execute_sql(sql, values)
+    end
+  end
 end

data/squealer.gemspec

@@ -5,27 +5,28 @@
 
 Gem::Specification.new do |s|
   s.name = %q{squealer}
-  s.version = "2.1.1"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Graham", "Durran Jordan", "Matt Yoho", "Bernerd Schaefer"]
-  s.date = %q{2010-05-20}
+  s.date = %q{2010-06-23}
   s.default_executable = %q{skewer}
   s.description = %q{Exports mongodb to mysql. More later.}
   s.email = %q{joshua.graham@grahamis.com}
   s.executables = ["skewer"]
   s.extra_rdoc_files = [
-    "README.md"
+    "LICENSE",
+     "README.md"
   ]
   s.files = [
     ".gitignore",
      ".rvmrc",
      ".watchr",
+     "LICENSE",
      "README.md",
      "Rakefile",
      "VERSION",
      "bin/skewer",
-     "lib/.example_squeal.rb.swp",
      "lib/example_squeal.rb",
      "lib/squealer.rb",
      "lib/squealer/database.rb",
@@ -33,16 +34,17 @@ Gem::Specification.new do |s|
      "lib/squealer/object.rb",
      "lib/squealer/progress_bar.rb",
      "lib/squealer/target.rb",
-     "lib/squealer/time.rb",
      "lib/tasks/jeweler.rake",
+     "spec/integration/export_a_record_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/spec_helper_dbms_mysql.rb",
+     "spec/spec_helper_dbms_postgres.rb",
      "spec/squealer/database_spec.rb",
      "spec/squealer/hash_spec.rb",
      "spec/squealer/object_spec.rb",
      "spec/squealer/progress_bar_spec.rb",
      "spec/squealer/target_spec.rb",
-     "spec/squealer/time_spec.rb",
      "squealer.gemspec"
   ]
   s.homepage = %q{http://github.com/delitescere/squealer/}
@@ -51,13 +53,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Document-oriented to Relational database exporter}
   s.test_files = [
-    "spec/spec_helper.rb",
+    "spec/integration/export_a_record_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/spec_helper_dbms_mysql.rb",
+     "spec/spec_helper_dbms_postgres.rb",
      "spec/squealer/database_spec.rb",
      "spec/squealer/hash_spec.rb",
      "spec/squealer/object_spec.rb",
      "spec/squealer/progress_bar_spec.rb",
-     "spec/squealer/target_spec.rb",
-     "spec/squealer/time_spec.rb"
+     "spec/squealer/target_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -65,18 +69,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mysql>, [">= 2.8.1"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.1"])
+      s.add_runtime_dependency(%q<data_objects>, [">= 0.10.2"])
+      s.add_runtime_dependency(%q<mysql>, [">= 2.8.1"])
+      s.add_runtime_dependency(%q<do_mysql>, [">= 0.10.2"])
+      s.add_runtime_dependency(%q<pg>, [">= 0.9.0"])
+      s.add_runtime_dependency(%q<do_postgres>, [">= 0.10.2"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<mysql>, [">= 2.8.1"])
       s.add_dependency(%q<mongo>, [">= 0.18.3"])
       s.add_dependency(%q<bson_ext>, [">= 1.0.1"])
+      s.add_dependency(%q<data_objects>, [">= 0.10.2"])
+      s.add_dependency(%q<mysql>, [">= 2.8.1"])
+      s.add_dependency(%q<do_mysql>, [">= 0.10.2"])
+      s.add_dependency(%q<pg>, [">= 0.9.0"])
+      s.add_dependency(%q<do_postgres>, [">= 0.10.2"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<mysql>, [">= 2.8.1"])
     s.add_dependency(%q<mongo>, [">= 0.18.3"])
     s.add_dependency(%q<bson_ext>, [">= 1.0.1"])
+    s.add_dependency(%q<data_objects>, [">= 0.10.2"])
+    s.add_dependency(%q<mysql>, [">= 2.8.1"])
+    s.add_dependency(%q<do_mysql>, [">= 0.10.2"])
+    s.add_dependency(%q<pg>, [">= 0.9.0"])
+    s.add_dependency(%q<do_postgres>, [">= 0.10.2"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squealer
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Josh Graham
@@ -18,57 +18,137 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -05:00
+date: 2010-06-23 00:00:00 -05:00
 default_executable: skewer
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: mongo
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 81
         segments: 
-        - 2
-        - 8
-        - 1
-        version: 2.8.1
+        - 0
+        - 18
+        - 3
+        version: 0.18.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: bson_ext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 81
+        hash: 21
         segments: 
+        - 1
         - 0
-        - 18
-        - 3
-        version: 0.18.3
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: data_objects
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 51
         segments: 
-        - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: do_mysql
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: do_postgres
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id008
 description: Exports mongodb to mysql. More later.
 email: joshua.graham@grahamis.com
 executables: 
@@ -76,16 +156,17 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.md
 files: 
 - .gitignore
 - .rvmrc
 - .watchr
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
 - bin/skewer
-- lib/.example_squeal.rb.swp
 - lib/example_squeal.rb
 - lib/squealer.rb
 - lib/squealer/database.rb
@@ -93,16 +174,17 @@ files:
 - lib/squealer/object.rb
 - lib/squealer/progress_bar.rb
 - lib/squealer/target.rb
-- lib/squealer/time.rb
 - lib/tasks/jeweler.rake
+- spec/integration/export_a_record_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/spec_helper_dbms_mysql.rb
+- spec/spec_helper_dbms_postgres.rb
 - spec/squealer/database_spec.rb
 - spec/squealer/hash_spec.rb
 - spec/squealer/object_spec.rb
 - spec/squealer/progress_bar_spec.rb
 - spec/squealer/target_spec.rb
-- spec/squealer/time_spec.rb
 - squealer.gemspec
 has_rdoc: true
 homepage: http://github.com/delitescere/squealer/
@@ -139,10 +221,12 @@ signing_key:
 specification_version: 3
 summary: Document-oriented to Relational database exporter
 test_files: 
+- spec/integration/export_a_record_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_dbms_mysql.rb
+- spec/spec_helper_dbms_postgres.rb
 - spec/squealer/database_spec.rb
 - spec/squealer/hash_spec.rb
 - spec/squealer/object_spec.rb
 - spec/squealer/progress_bar_spec.rb
 - spec/squealer/target_spec.rb
-- spec/squealer/time_spec.rb