sqlite_magic 0.0.3 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjEzZTViZTI2MTgwOTRiODQ4YzEzYzQyN2FkY2I0YmQ1Yjg4YzEzNA==
+  data.tar.gz: !binary |-
+    ZWIxMGEzZTliNWRiODI5MTFlYTNmYTQxOWYwZDJjOTAzZjliZWEzYQ==
+SHA512:
+  metadata.gz: !binary |-
+    NzU4M2IwZGQ5ZTRiYmY1NzdmMTFjN2UzY2QyMTkxMzk0NTNhNzMwYzBiMGM5
+    MzRhNjcyZDBiZDgwYmY2ZjdmM2FmODhhNTBjYTY3MDY4MTdjYzliYzUyMGY5
+    MjY2MjdiM2I0NDIzOGU2MTVmMjg2YWFlOTNhMzFmYjUzMjYyNjg=
+  data.tar.gz: !binary |-
+    NzkxMDI5MTQ1YzhhN2U1NDJiMzA2ZGQ3ZWI5NzVmYTJlZmUzYzNhZWI3Y2Q4
+    YzkyZWViZGFlZjZjNDY3YjU0OTNmYTk0MmUzMjEwMWM1MTc3YzdjMGFjODhi
+    OGU2M2EzZDZkYWViY2QzOGJhZGRmY2UyYTdjOWU4NmYxNTY0Y2M=

data/.travis.yml

@@ -6,6 +6,6 @@ rvm:
   # - jruby-18mode # JRuby in 1.8 mode
   # - jruby-19mode # JRuby in 1.9 mode
   # - rbx-18mode
-  - rbx-19mode
+  # - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:
 script: bundle exec rspec spec

data/lib/sqlite_magic/version.rb

@@ -1,3 +1,3 @@
 module SqliteMagic
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/sqlite_magic.rb

@@ -36,6 +36,11 @@ module SqliteMagic
       query = unique_keys ? "CREATE TABLE #{tbl_name} (#{col_names.join(',')}, UNIQUE (#{unique_keys.join(',')}))" :
                             "CREATE TABLE #{tbl_name} (#{col_names.join(',')})"
       database.execute query
+      if unique_keys && !unique_keys.empty?
+        query = "CREATE UNIQUE INDEX IF NOT EXISTS #{unique_keys.join('_')} " +
+          "ON #{tbl_name} (#{unique_keys.join(',')})"
+        database.execute query
+      end
     end
 
     def execute(query,data=nil)
@@ -54,15 +59,17 @@ module SqliteMagic
 
     # This is an (expensive) convenience method to insert a row (for given unique keys), or if the row already exists
     #
-    def insert_or_update(uniq_keys, values_hash, tbl_name='main_table')
+    def insert_or_update(uniq_keys, values_hash, tbl_name='main_table', opts={})
       all_field_names = values_hash.keys
       field_names_as_symbol_string = all_field_names.map{ |k| ":#{k}" }.join(',') # need to appear as symbols
       sql_statement = "INSERT INTO #{tbl_name} (#{all_field_names.join(',')}) VALUES (#{field_names_as_symbol_string})"
       database.execute(sql_statement, values_hash)
     rescue SQLite3::ConstraintException => e
       unique_key_constraint = uniq_keys.map { |k| "#{k}=:#{k}" }.join(' AND ')
-      update_keys = (values_hash.keys - uniq_keys).map { |k| "#{k}=:#{k}" }.join(', ')
-      sql_statement = "UPDATE #{tbl_name} SET #{update_keys} WHERE #{unique_key_constraint}"
+      update_keys = values_hash.keys
+      update_keys -= uniq_keys if !opts[:update_unique_keys]
+      update_sql = update_keys.map { |k| "#{k}=:#{k}" }.join(', ')
+      sql_statement = "UPDATE #{tbl_name} SET #{update_sql} WHERE #{unique_key_constraint}"
       database.execute sql_statement, values_hash
     rescue SQLite3::SQLException => e
       puts "Exception (#{e.inspect}) raised" if verbose?
@@ -181,4 +188,3 @@ module SqliteMagic
   # end
 
 end
-

data/spec/lib/sqlite_magic_spec.rb

@@ -214,9 +214,11 @@ describe SqliteMagic do
       end
 
       context 'and unique keys are given' do
-        it 'should add constraint for given keys' do
-          expected_query = "CREATE TABLE some_table (foo,bar,baz, UNIQUE (foo,baz))"
-          @dummy_db.should_receive(:execute).with(expected_query)
+        it 'should add constraint and index for given keys' do
+          expected_query_1 = "CREATE TABLE some_table (foo,bar,baz, UNIQUE (foo,baz))"
+          expected_query_2 = "CREATE UNIQUE INDEX IF NOT EXISTS foo_baz ON some_table (foo,baz)"
+          @dummy_db.should_receive(:execute).with(expected_query_1)
+          @dummy_db.should_receive(:execute).with(expected_query_2)
           @connection.create_table(:some_table, [:foo,:bar,:baz], [:foo,:baz])
         end
       end
@@ -281,6 +283,14 @@ describe SqliteMagic do
           @connection.insert_or_update(@unique_keys, @datum, 'foo_table')
         end
 
+        context "and :update_unique_keys specified in opts" do
+          it 'should update all columns including unique keys' do
+            @expected_update_query = "UPDATE foo_table SET foo=:foo, foo2=:foo2, foo3=:foo3, foo4=:foo4 WHERE foo2=:foo2 AND foo3=:foo3"
+            @dummy_db.should_receive(:execute).with(@expected_update_query, @datum)
+            @connection.insert_or_update(@unique_keys, @datum, 'foo_table', :update_unique_keys => true)
+          end
+        end
+
         context 'and no table name given' do
           before do
             @expected_update_query = "UPDATE main_table SET foo=:foo, foo4=:foo4 WHERE foo2=:foo2 AND foo3=:foo3"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sqlite_magic
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Chris Taggart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,27 +89,26 @@ files:
 homepage: https://github.com/openc/sqlite_magic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sprinkles some magic onto Sqlite3 gem
 test_files:
 - spec/.DS_Store