sequel_tools 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3668a069d02fe15d3bb54d054ad64dd0eab240ba4f6e65023aa8a6f92b3008cf
-  data.tar.gz: '019eefc9bf0565c54126fd54670da7623094a133dcddf34cbcaf75498f282c9e'
+  metadata.gz: 06cfd2214117b4cdfb808527ff3c611d55e3c661270460f04cf8f9b87effb60e
+  data.tar.gz: 0ab06e31e27d5781b820c783a10f41c9a54eb12df033611be3fdfad1fabbc896
 SHA512:
-  metadata.gz: bf9dcaa9cea96bbcec7afaf439e9b32d95baa36181769dd0a954e9a7da25a4f04594483757aedea620bd1fd2899e83d4553682c3e6e193e7463dc26615db03af
-  data.tar.gz: ef6078623ab39f8d58f78c1f836b08081b4c4ab1b94981cf9fea6d3a47efb7d1c887af77d381e55c9c79f8d9f9dcf695c401eec1a14906612f57b15a04c84885
+  metadata.gz: e9a44d46447c25dfd7380286812e32725f958aac419b02a6d8d3e38a83a421186762a539e3b5ed3c61de81580ad8752de911a046ad69817395b18f63a37f0d5d
+  data.tar.gz: 9fd7486aae118ff74d43bb0d797778d26d7dab0b93b69c2e0dcb4f49fc986da9d5ea3913b205e7844b71f4e6f41635451cb1d4f08c1d51d4d3afb8942dc7fb4f

data/README.md

@@ -40,8 +40,8 @@ Here's a sample Rakefile supporting migrate actions:
 require 'bundler/setup'
 require 'sequel_tools'
 
-base_config = SequelTools.base_config(
-  project_root: File.expand_path(__dir__),
+base_config = {
+  # project_root: Dir.pwd,
   dbadapter: 'postgres',
   dbname: 'mydb',
   username: 'myuser',
@@ -63,7 +63,14 @@ base_config = SequelTools.base_config(
   # when nil, defaults to the value of the :dbadapter config.
   # This is the database we should connect to before executing "create database dbname"
   maintenancedb: :default,
-)
+  # migrations_table: 'schema_migrations',
+  # allow other tables data to be included in the dump file generated by rake db:schema_dump
+  # extra_tables_in_dump: nil
+  # for example, if you want to keep migrations from ActiveRecord in the dump file, while using
+  # another table for Sequel migrations:
+  # migrations_table: 'sequel_schema_migrations',
+  # extra_tables_in_dump: ['schema_migrations'],
+}
 
 namespace 'db' do
   SequelTools.inject_rake_tasks base_config.merge(dump_schema_on_migrate: true), self
@@ -120,7 +127,7 @@ PGPASSWORD=$DBPASSWORD
 psql
 ```
 
-Then you may pass `shell_command: '~/bin/opensql'` to `SequelTools.base_config`.
+Then you may set `shell_command: '~/bin/opensql'` in config.
 
 Alternatively you can define the `shell_#{dbadapter}` action if you prefer. Take a look at
 the implementation for `shell_postgres` to see how to do that. If you want to share that action

data/lib/sequel_tools/actions/shell_postgres.rb

@@ -8,8 +8,8 @@ class SequelTools::ActionsManager
     psql = c[:psql]
     env = {
       'PGDATABASE' => c[:dbname],
-      'PGHOST' => c[:dbhost],
-      'PGPORT' => c[:dbport].to_s,
+      'PGHOST' => c[:dbhost] || 'localhost',
+      'PGPORT' => (c[:dbport] || 5432).to_s,
       'PGUSER' => c[:username],
       'PGPASSWORD' => c[:password].to_s,
     }

data/lib/sequel_tools/actions_manager.rb

@@ -9,9 +9,14 @@ module SequelTools
       uri_parts = []
       uri_parts << 'jdbc:' if RUBY_PLATFORM == 'java'
       uri_parts << "#{c[:jdbc_adapter] || c[:dbadapter]}://"
-      uri_parts << c[:dbhost]
-      uri_parts << ':' << c[:dbport] if c[:dbport]
-      uri_parts << '/' << dbname
+      host = c[:dbhost]
+      host ||= 'localhost' unless (c[:dbadapter] == 'sqlite') || c[:no_dbhost]
+      if host
+        uri_parts << host
+        uri_parts << ':' << c[:dbport] if c[:dbport]
+        uri_parts << '/'
+      end
+      uri_parts << dbname
       if user = c[:username]
         uri_parts << '?user=' << user
         uri_parts << '&password=' << c[:password] if c[:password]

data/lib/sequel_tools/pg_helper.rb

@@ -7,12 +7,14 @@ class PgHelper
     Tempfile.open 'pgpass' do |file|
       c = config
       file.chmod 0600
-      file.write "#{c[:dbhost]}:#{c[:dbport]}:#{c[:dbname]}:#{c[:username]}:#{c[:password]}"
+      host = c[:dbhost] || 'localhost'
+      port = c[:dbport] || '5432'
+      file.write "#{host}:#{port}:#{c[:dbname]}:#{c[:username]}:#{c[:password]}"
       file.close
       env = {
         'PGDATABASE' => connect_database || c[:dbname],
-        'PGHOST' => c[:dbhost],
-        'PGPORT' => c[:dbport].to_s,
+        'PGHOST' => host,
+        'PGPORT' => port.to_s,
         'PGUSER' => c[:username],
         'PGPASSFILE' => file.path
       }

data/lib/sequel_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen-string-literal: true
 
 module SequelTools
-  VERSION = '0.1.12'
+  VERSION = '0.1.14'
 end

data/lib/sequel_tools.rb

@@ -4,7 +4,7 @@ require 'sequel_tools/version'
 
 module SequelTools
   DEFAULT_CONFIG = {
-    project_root: nil,
+    project_root: Dir.pwd,
     pg_dump: 'pg_dump', # command used to run pg_dump
     psql: 'psql', # command used to run psql
     maintenancedb: :default, # DB to connect to for creating/dropping databases
@@ -12,7 +12,7 @@ module SequelTools
     schema_location: 'db/migrations/schema.sql',
     seeds_location: 'db/seeds.rb',
     dbname: nil,
-    dbhost: 'localhost',
+    dbhost: nil,
     dbadapter: 'postgres',
     dbport: nil,
     username: nil,
@@ -24,7 +24,7 @@ module SequelTools
     extra_tables_in_dump: nil,
   } # unfrozen on purpose so that one might want to update the defaults
 
-  REQUIRED_KEYS = [ :project_root, :dbadapter, :dbname, :username ]
+  REQUIRED_KEYS = [ :dbadapter, :dbname ]
   class MissingConfigError < StandardError; end
   def self.base_config(extra_config = {})
     config = DEFAULT_CONFIG.merge extra_config
@@ -40,7 +40,7 @@ module SequelTools
   def self.inject_rake_tasks(config = {}, rake_context)
     require_relative 'sequel_tools/actions_manager'
     require_relative 'sequel_tools/all_actions'
-    actions_manager = ActionsManager.new config
+    actions_manager = ActionsManager.new base_config(config)
     actions_manager.load_all
     actions_manager.export_as_rake_tasks rake_context
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Rodrigo Rosenfeld Rosas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel