objectstore 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64c41b9f098d2e1c425a0f70ccf24bddb403c2aa
-  data.tar.gz: 9e2dcb690ebec07ae7e37a6ab410ad621fdfece2
+  metadata.gz: 8a7d9b4af24d561be98bb2fd2121d5b309934790
+  data.tar.gz: 20b360b5e44dc1af76cf038f57c0f5a59d3da9cd
 SHA512:
-  metadata.gz: 7a2f22153fe71f80632853a099609bc49ef1ac34a2e3beb259c09db85866e88f340748eb54d90704debe1125e783888fd2b8e50c40eef3f5130b0cc6e24f6d67
-  data.tar.gz: 75c3ffb8e3659fe5637fdd49539a57ce733f57f57fbcbc47d54a3e99eb4ca88b859aa19033f045234bd5592521ef2693db38965f2042a1479bbd0437b8f6ef1b
+  metadata.gz: 69c2b445d15f6a9daab7e409c2bf55e0c035c9a36a7b85829a44e882c7a3fba40498c78e7b3b3cf046975de7d5ff37c280c607afbf22cee65cc97403cf0070f6
+  data.tar.gz: 9696ac2ed74a1439715b4aac51583aa3393cd8c8b037823d0513141c1cfd188b4b5a435895cc6578ad84bb416dfac4dbab2d1d4506bf6592c82cfc44c0b96418

data/lib/atech/object_store/file.rb

@@ -13,6 +13,9 @@ module Atech
       ## Raised if the data is larger than the maximum file size
       class FileDataTooBig < Error; end
 
+      # Raised when a row could not be inserted into the database
+      class InsertError < Error; end
+
       # Run a single query on a backend connection. This should only be used when running a single query. If you need
       # to do multiple things on the same connection (e.g. INSERT and then get LAST_INSERT_ID) you should checkot your
       # own connection using ObejctStore::Connection.client
@@ -73,13 +76,7 @@ module Atech
         options[:created_at] = options[:created_at].utc
         options[:updated_at] = options[:updated_at].utc
 
-        # Create an insert query
-        last_insert_id = ObjectStore::Connection.client do |client|
-          columns = options.keys.join('`,`')
-          data = options.values.map { |v| escape_and_quote(v) }.join(',')
-          client.query("INSERT INTO files (`#{columns}`) VALUES (#{data})")
-          client.last_id
-        end
+        last_insert_id = insert_into_database(options)
 
         ## Return a new File object
         self.new(options.merge(:id => last_insert_id))
@@ -182,6 +179,26 @@ module Atech
         end
       end
 
+      def self.insert_into_database(options)
+        retries = 0
+
+        # Create an insert query
+        last_insert_id = ObjectStore::Connection.client do |client|
+          columns = options.keys.join('`,`')
+          data = options.values.map { |v| escape_and_quote(v) }.join(',')
+          client.query("INSERT INTO files (`#{columns}`) VALUES (#{data})")
+          client.last_id
+        end
+
+        raise InsertError if last_insert_id == 0
+
+        last_insert_id
+      rescue InsertError => e
+        raise e if retries >= 2
+        retries += 1
+        retry
+      end
+
       def self.escape_and_quote(string)
         string = string.strftime('%Y-%m-%d %H:%M:%S') if string.is_a?(Time)
         ObjectStore::Connection.client do |client|

data/lib/atech/object_store/version.rb

@@ -1,5 +1,5 @@
 module Atech
   module ObjectStore
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: objectstore
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: A SQL based object store library