uc3-dmp-rds 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ceba0e24d5a6a925fde46a68d7d8f1586aa29bf1687e94000d989f6ab522e3e
-  data.tar.gz: 0d6ef838acd8ce79e5638e83b45c8bbdb72cd919863916ad0d48d5658ab079b8
+  metadata.gz: 4181722f3ac149e1843e0372c04cc326341021eef62df0d52efafbf524fb4876
+  data.tar.gz: 9e561848f90dc6961e89f8b051b6dac8f896d119bf6f4e25e409fcf5ac1f4562
 SHA512:
-  metadata.gz: 7aa9e392a307c55483d432c487ef5a5c0ab6c501e7e3081646f5945ba7fe5322fd29b2eb1d3b81d110f94db0ec252f624fcdcf70a4f903df0cdc434e2851b99b
-  data.tar.gz: 2ced3df663f4dc6ee3d360625ff12c3a267c9a136c1d9535a54a41d51092691a7e8e316ec39fb8eca207b98807abc623f0a47bcaacbca3dd6c55275997211fba
+  metadata.gz: 439be8d21f8eb86b72d0599e0bcfa89e93c032a372bcf4321462cd83435995a9115433bf533a3b88930c2f641b058eb54df7cdca9e80f85979b8dbd632d5919a
+  data.tar.gz: 6118678a2c94fbd6d871d15403ab17fc4e52434b422fe7bf1b093aa481ab97d41615cd5037a9a032ce230626a72452c01f0ad7fa23728e9c4f6ee934f03a0898

data/lib/uc3-dmp-rds/adapter.rb

@@ -22,7 +22,8 @@ module Uc3DmpRds
   class Adapter
     MSG_KEYWORDS_INVALID = 'The parameters specified do not match those in the SQL query'
     MSG_MISSING_CREDENTIALS = 'No username and/or password specified'
-    MSG_NO_CONNECTION = 'No current database connection. Call Uc3DmpRds.connect first'
+    MSG_UNABLE_TO_CONNECT = 'Unable to establish a connection'
+    MSG_UNABLE_TO_QUERY = 'Unable to process the query'
 
     class << self
       # Connect to the RDS instance
@@ -30,8 +31,6 @@ module Uc3DmpRds
         raise AdapterError, MSG_MISSING_CREDENTIALS if username.nil? || username.to_s.strip.empty? ||
                                                        password.nil? || password.to_s.strip.empty?
 
-puts "CONNECT - host: #{ENV['DATABASE_HOST']}, port: #{ENV['DATABASE_PORT']}, name: #{ENV['DATABASE_NAME']}, username: #{username}, password.lenght: #{password.length}"
-
         connection = ActiveRecord::Base.establish_connection(
           adapter: 'mysql2',
           host: ENV.fetch('DATABASE_HOST', nil),
@@ -41,21 +40,20 @@ puts "CONNECT - host: #{ENV['DATABASE_HOST']}, port: #{ENV['DATABASE_PORT']}, na
           password: password,
           encoding: 'utf8mb4'
         )
-
-puts connection.inspect
-puts "CONNECTED? #{ActiveRecord::Base.connected?}"
-
-        ActiveRecord::Base.connected?
+        !connection.nil?
+      rescue StandardError => e
+        raise AdapterError, "#{MSG_UNABLE_TO_CONNECT} - #{e.message}"
       end
 
       # Execute the specified query using ActiveRecord's helpers to sanitize the input
       def execute_query(sql:, **params)
-        raise AdapterError, MSG_NO_CONNECTION unless ActiveRecord::Base.connected?
         return [] unless sql.is_a?(String) && !sql.strip.empty? && (params.nil? || params.is_a?(Hash))
         # Verify that all of the kewords are accounted for and that values were supplied
         raise AdapterError, MSG_KEYWORDS_INVALID unless _verify_params(sql: sql, params: params)
 
         ActiveRecord::Base.simple_execute(sql, params)
+      rescue StandardError => e
+        raise AdapterError, "#{MSG_UNABLE_TO_QUERY} - #{e.message}"
       end
 
       private

data/lib/uc3-dmp-rds/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpRds
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian Riley