blackstack-db 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 353b4b2bdb838ebab93502e2e02ac00729a9c2056c7a7299ae513013f16ca093
-  data.tar.gz: 7dd91a9b54af25ce2d35f7948bb9be89879301630b6009578c565a635f5997af
+  metadata.gz: bbd6c260dad3244665d28642c195ac7c30c4e793618a63a3d9b5e8d20a0d5222
+  data.tar.gz: 235c9e11c1dfd0095ae7d0c426a4960499d899c13e5f621c4d55b4048e481f9e
 SHA512:
-  metadata.gz: 5823b900dea5263daf3e93a9f8a09cedf4bc5e36a73c2b118c179a1696a1419a7e5988319de982dc9f16b39efb2aa294ac54ddd117a3efa36e7c4e7e029d858e
-  data.tar.gz: 7c4f6c16b311a98fec899d417e25c7b45564df4f5690384c7a0c965b8357bcefe824016688af3cd3e71cbe0ac6872c1c49740d54c5427c64effd0b1ab7dd43b8
+  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.to_s
-                raise 'Wrong database name' if s !~ /:database_name=>\"#{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,6 +37,16 @@ module BlackStack
         end
     end
 
+    def self.db_test(l=nil)
+        if @@db_type == TYPE_POSTGRESQL
+            return BlackStack::PostgreSQL.test(l)
+        elsif @@db_type == TYPE_CRDB
+            return BlackStack::CRDB.test(l)
+        else
+            raise "Unknown database type"
+        end
+    end # test
+
 end # BlackStack
 
 # return a postgresql uuid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-db
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize