blackstack-db 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7bb074f4d88555ea328860cc08bc1ba72a2299db81fef74ed839e0ca22f3d34
-  data.tar.gz: 3cfdd099de0d3f6dc05e7f553e4dc94f5420e3af94552cda2c8f1d9196ad7c4c
+  metadata.gz: bbd6c260dad3244665d28642c195ac7c30c4e793618a63a3d9b5e8d20a0d5222
+  data.tar.gz: 235c9e11c1dfd0095ae7d0c426a4960499d899c13e5f621c4d55b4048e481f9e
 SHA512:
-  metadata.gz: 3edc6fb80fa604ec8c2862df98509398b856bc2e517c97d563e602b757c04066b8365c12d4ea50c37dbaf494ec778fe14dc71a730d53312f0ecc75595f911d15
-  data.tar.gz: 6d18124e13b0cdcc2f64c4c3567d3f57f5968f06d7e75587c9cc7141cd06aec6c433ad42760cb84b3f4808a002e773de8d7419b87784547cc8f9b8721a302303
+  metadata.gz: 8d1e697ab4f75d02f900fc5a095840306ba58170eb7965e6ef2634701e25b7c9ddaf6fa9f68bc91f2e5e28b071d5801af6ac9adfbcdbd04f99c4ecef2a7e4fb1
+  data.tar.gz: 623ec3594481d480dfa2c015f7b3ef1659c7d25c9eca0f820e9075ff997daef76514c14b8e63064b10e386484c3023a0e62148427317eb25f89baa6511642614

data/lib/blackstack-db/crdb.rb

@@ -130,9 +130,7 @@ module BlackStack
             
             l.logs "Testing connection... "
             begin
-                @db = BlackStack::Deployer::DB::connect(
-                    BlackStack::CRDB::connection_string # use the connection parameters setting in ./config.rb
-                )
+                @db = BlackStack::CRDB::connect
                 l.logf "success".green
             rescue => e
                 l.logf "failed".red

data/lib/blackstack-db/postgresql.rb

@@ -80,7 +80,8 @@ module BlackStack
         # create database connection
         def self.connect
             BlackStack::set_db_type(BlackStack::TYPE_POSTGRESQL)
-            Sequel.connect(BlackStack::PostgreSQL.connection_string)
+            s = BlackStack::PostgreSQL.connection_string
+            Sequel.connect(s)
         end
 
         # return a postgresql uuid
@@ -112,9 +113,7 @@ module BlackStack
             
             l.logs "Testing connection... "
             begin
-                @db = BlackStack::Deployer::DB::connect(
-                    BlackStack::PostgreSQL::connection_string # use the connection parameters setting in ./config.rb
-                )
+                @db = BlackStack::PostgreSQL::connect
                 l.logf "success".green
             rescue => e
                 l.logf "failed".red
@@ -125,8 +124,8 @@ module BlackStack
             # This validation checks the connection to the correct database.
             begin
                 l.logs "Verify database name... "
-                s = @db["SELECT datname FROM pg_database"].first[:datname]
-                raise 'Wrong database name' if s !~ /#{Regexp.escape(BlackStack::PostgreSQL::db_name)}/i
+                s = @db["SELECT datname FROM pg_database WHERE datname='#{BlackStack::PostgreSQL::db_name}'"].first
+                raise 'Wrong database name' if s.nil?
                 l.logf "success".green
             rescue => e
                 l.logf "failed".red

data/lib/blackstack-db.rb

@@ -37,7 +37,7 @@ module BlackStack
         end
     end
 
-    def self.test(l=nil)
+    def self.db_test(l=nil)
         if @@db_type == TYPE_POSTGRESQL
             return BlackStack::PostgreSQL.test(l)
         elsif @@db_type == TYPE_CRDB

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-db
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Leandro Daniel Sardi