simple-sql 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96995841ebed4baaca67fa39701958d3ccff3a36325400075b043eb1d7236de5
-  data.tar.gz: fc6ae8d35382e6c6d0aead1743ade7add236cc9e40e50d8f896f353a8e804b3d
+  metadata.gz: 0e247c58e46b3508c73b90dfe1000471c773d4f73e1c0ed7ce12204533910f69
+  data.tar.gz: 4c1fd0c77995b9693ea516939994420f0dc7c019c8c36064ccf60c34cef2edfd
 SHA512:
-  metadata.gz: 5b22a609bcee2a0ad16d1026e586e4845757d63bef891cfa6f38f4ab6268bdf752a34cb5eb72b588e53ffd31c53080b922095e22a1b4556c0c1047fbd505265b
-  data.tar.gz: bf5dc5c752346705a75ab3274c96a4998012344af45400e76f2f00f5498ed676caa95ff70406654c3ce0d05cbeaabba3d4fd9350c1ee3a4c8bb256ba703e8bff
+  metadata.gz: 6d77182e024d7c4b92ba61f7e37b06ee694d4940862d307f602874245bb51fd8c6bfdff4c7d584823a60f8b34186bce6633f0fcf65f363804c28c99cd7b5378c
+  data.tar.gz: d79889f4dcddc7845bf444493b5a1e0a8076cf2fb71ff3aae90fdaa89ba069ce77a59ee90a9bf70fae7baabfc3c8e89c80391f52f145c4ec4ff9a4f5da680958

data/lib/simple/sql/config.rb

@@ -27,14 +27,21 @@ module Simple::SQL::Config
 
   # determines the database_url from either the DATABASE_URL environment setting
   # or a config/database.yml file.
-  def determine_url
-    ENV["DATABASE_URL"] || database_url_from_database_yml
+  def determine_url(path: nil)
+    if path
+      database_url_from_database_yml(path)
+    elsif ENV["DATABASE_URL"]
+      ENV["DATABASE_URL"]
+    else
+      database_url_from_database_yml("config/database.yml")
+    end
   end
 
   private
 
-  def database_url_from_database_yml
-    abc = read_database_yml
+  def database_url_from_database_yml(path)
+    abc = load_activerecord_base_configuration(path: path, env: ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+
     username, password, host, port, database = abc.values_at "username", "password", "host", "port", "database"
 
     URI::Generic.build(
@@ -46,13 +53,13 @@ module Simple::SQL::Config
     ).to_s
   end
 
-  def read_database_yml
+  def load_activerecord_base_configuration(path:, env:)
     require "yaml"
-    database_config = YAML.load_file "config/database.yml"
+    database_config = YAML.load_file(path)
     env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
 
     database_config[env] ||
       database_config["defaults"] ||
-      raise("Invalid or missing database configuration in config/database.yml for #{env.inspect} environment")
+      raise("Invalid or missing database configuration in #{path} for #{env.inspect} environment")
   end
 end

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.5.21"
+    VERSION = "0.5.22"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser