gloo-mysql 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d45a88a3a1eb006e70be0d3b54874923e1f4dd02ac2f3c297cd1921975d1f9
-  data.tar.gz: b5e02252e4201e5ded230d69171304126c287570b3cd0c8af2e02cf742a3e26c
+  metadata.gz: 1a1b5f86ddb44b51299e14599208fb5276529e7675e47decdee1d7572ce28745
+  data.tar.gz: 3589a40a1974de5cc576471bfbe5e73008b887157a851f9cde8ee834ed9ce224
 SHA512:
-  metadata.gz: 5b1addd1be16de2b24a32cdd92b8d5048483370c291315409eae5bd247c6479428a5c3968392ec4d2bcf1afe6495a868a180d7937b0f75322d4c12c201b117cf
-  data.tar.gz: cf786e9a6d8ab705f5d679e97ee55b57a1c9c1ca05e262ac95c651a3e9265c3c080513ca33188eace2a4a9ac2bf946c11e77011d06b5594df5c436c2a804a7d7
+  metadata.gz: 4778f6a9ec72070177b2059267d8421998c7b11f181594211ac9f49daa3c6b2ec2fa2f8105050ea615e285a416f52d317cc3d2017fafedbff36e38285944f990
+  data.tar.gz: 18bd34ada82a4fffb813066d3384f7d04f26010c2ddd3e7a149d048bec5423ac92d297162090538276221380131bf8123c62398eb45c57b7ef0f4e96673b9542

data/lib/mysql.rb

@@ -17,9 +17,13 @@
 #   flags    = opts[:flags] || 0
 #
 require 'mysql2'
+require 'db_connection'
 
 class Mysql < Gloo::Core::Obj
 
+  # Shared driver behaviour from gloo-db: errors, verify, setup problems.
+  include DbConnection
+
   KEYWORD = 'mysql'.freeze
   KEYWORD_SHORT = 'mysql'.freeze
 
@@ -80,12 +84,22 @@ class Mysql < Gloo::Core::Obj
   end
 
   #
-  # SSH to the host and execute the command, then update result.
+  # Verify that the database connection can be established.
+  # It is true if it can, false if not (with the reason in the error).
   #
   def msg_verify
-    return unless connects?
+    verify_connection do
+      client = Mysql2::Client.new( connection_params )
+      client.close
+    end
+  end
 
-    @engine.heap.it.set_to true
+  #
+  # The exception classes that are database errors (DbConnection):
+  # Query reports these as 'Query failed: …'.
+  #
+  def database_errors
+    return [ Mysql2::Error ]
   end
 
 
@@ -112,13 +126,7 @@ class Mysql < Gloo::Core::Obj
       @engine.log.debug "Opening a new Connection."
     end
 
-    h = {
-      host: host_value,
-      database: db_value,
-      username: user_value,
-      password: passwd_value
-    }
-    client = Mysql2::Client.new( h )
+    client = Mysql2::Client.new( connection_params )
 
     app.cache_db_client( self, client ) if app
     
@@ -134,33 +142,30 @@ class Mysql < Gloo::Core::Obj
 
     heads = []
     data = []
-    begin
-      if params
-        pst = client.prepare( sql )
-        rs = pst.execute( *params, :as => :array )
-        if rs
-          rs.each do |row|
-            arr = []
-            row.each do |o| 
-              arr << o
-            end
-            data << arr
+    # Database errors come out as exceptions, for Query to report.
+    if params
+      pst = client.prepare( sql )
+      rs = pst.execute( *params, :as => :array )
+      if rs
+        rs.each do |row|
+          arr = []
+          row.each do |o| 
+            arr << o
           end
+          data << arr
         end
-      else
-        rs = client.query( sql, :as => :array ) 
-        if rs
-          rs.each do |row|
-            data << row
-          end
+      end
+    else
+      rs = client.query( sql, :as => :array ) 
+      if rs
+        rs.each do |row|
+          data << row
         end
       end
-
-      heads = rs.fields if rs
-    rescue => e
-      @engine.log_exception e
     end
 
+    heads = rs.fields if rs
+
     return [ heads, data ]
   end
 
@@ -227,24 +232,15 @@ class Mysql < Gloo::Core::Obj
   end
 
   #
-  # Try the connection and make sure it works.
-  # Returns true if we can establish a connection.
+  # The settings for a connection, from the children.
   #
-  def connects?
-    begin
-      h = {
-        host: host_value,
-        database: db_value,
-        username: user_value,
-        password: passwd_value
-      }
-      Mysql2::Client.new( h )
-    rescue => e
-      @engine.log_exception e
-      @engine.heap.it.set_to false
-      return false
-    end
-    return true
+  def connection_params
+    return {
+      host: host_value,
+      database: db_value,
+      username: user_value,
+      password: passwd_value
+    }
   end
 
   # ---------------------------------------------------------------------
@@ -266,7 +262,7 @@ class Mysql < Gloo::Core::Obj
         "password (string) — The user's password."
       ],
       :messages => [
-        'verify — Verify that the database connection can be established.'
+        'verify — Verify that the database connection can be established. It is true if it can, false if not (with the reason in the error).'
       ],
       :examples => <<~EXAMPLES.strip
         mysql [can] :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gloo-mysql
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Eric Crane
@@ -29,6 +29,88 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: gloo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: gloo-db
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.14.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
 description: Adds MySQL support to Gloo.
 email:
 - eric.crane@mac.com