@@ -24,11 +24,6 @@ module Sqldef
24
24
]
25
25
private_constant :COMMANDS
26
26
27
- ENVS = {
28
- 'psqldef' => { 'PGSSLMODE' => 'disable' } , # TODO: support updating this
29
- }
30
- private_constant :ENVS
31
-
32
27
@bin = Dir . pwd
33
28
34
29
class << self
@@ -40,7 +35,7 @@ def export(command:, path:, host:, port: nil, user:, password: nil, database:)
40
35
sqldef = download ( command )
41
36
schema = IO . popen (
42
37
[
43
- env ( command ) , sqldef ,
38
+ sqldef ,
44
39
"--user=#{ user } " , *( [ "--password=#{ password } " ] if password ) ,
45
40
"--host=#{ host } " , *( [ "--port=#{ port } " ] if port ) ,
46
41
'--export' , database ,
@@ -56,7 +51,7 @@ def export(command:, path:, host:, port: nil, user:, password: nil, database:)
56
51
def dry_run ( command :, path :, host :, port : nil , user :, password : nil , database :)
57
52
sqldef = download ( command )
58
53
execute (
59
- env ( command ) , sqldef ,
54
+ sqldef ,
60
55
"--user=#{ user } " , *( [ "--password=#{ password } " ] if password ) ,
61
56
"--host=#{ host } " , *( [ "--port=#{ port } " ] if port ) ,
62
57
'--dry-run' , database ,
@@ -69,7 +64,7 @@ def dry_run(command:, path:, host:, port: nil, user:, password: nil, database:)
69
64
def apply ( command :, path :, host :, port : nil , user :, password : nil , database :)
70
65
sqldef = download ( command )
71
66
execute (
72
- env ( command ) , sqldef ,
67
+ sqldef ,
73
68
"--user=#{ user } " , *( [ "--password=#{ password } " ] if password ) ,
74
69
"--host=#{ host } " , *( [ "--port=#{ port } " ] if port ) ,
75
70
database ,
@@ -109,10 +104,6 @@ def execute(*cmd, **opts)
109
104
end
110
105
end
111
106
112
- def env ( command )
113
- ENVS . fetch ( command . to_s , { } )
114
- end
115
-
116
107
def build_url ( command )
117
108
unless COMMANDS . include? ( command )
118
109
raise "Unexpected sqldef command: #{ command } "
0 commit comments