Merge pull request #103 from Mapotempo/accept_connection_string_with_tls

accept connection string with TLS
Mapotempo · Feb 11, 2025 · 3971899 · 3971899
2 parents 0c3cbd2 + 54c1d66
commit 3971899
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/couchbase-orm/connection.rb b/lib/couchbase-orm/connection.rb
@@ -21,9 +21,13 @@ def self.config=(config)
     def self.cluster
       @cluster ||= begin
         cb_config = Couchbase::Configuration.new
-        cb_config.connection_string = config[:connection_string].presence.try { |s|
-          "couchbase://#{s}"
-        } || raise(CouchbaseOrm::Error.new('Missing CouchbaseOrm host'))
+        cb_config.connection_string = config[:connection_string].presence.try do |s|
+          if s.start_with?('couchbase://', 'couchbases://')
+            s
+          else
+            "couchbase://#{s}"
+          end
+        end || raise(CouchbaseOrm::Error.new('Missing CouchbaseOrm host'))
         cb_config.username = config[:username].presence || raise(CouchbaseOrm::Error.new('Missing CouchbaseOrm username'))
         cb_config.password = config[:password].presence || raise(CouchbaseOrm::Error.new('Missing CouchbaseOrm password'))
         Couchbase::Cluster.connect(cb_config)