Skip to content

Commit 68bc26e

Browse files
committed
fix debug opts
1 parent 9e8b248 commit 68bc26e

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

internal/cmd/plugin_engine.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/sqlc-dev/sqlc/internal/sql/ast"
2222
"github.com/sqlc-dev/sqlc/internal/sql/catalog"
2323
"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
24-
2524
pb "github.com/sqlc-dev/sqlc/pkg/engine"
2625
)
2726

internal/cmd/plugin_engine_test.go

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"github.com/sqlc-dev/sqlc/internal/config"
1212
"github.com/sqlc-dev/sqlc/internal/ext"
13-
"github.com/sqlc-dev/sqlc/internal/opts"
1413
"github.com/sqlc-dev/sqlc/internal/plugin"
1514
pb "github.com/sqlc-dev/sqlc/pkg/engine"
1615
)
@@ -122,10 +121,8 @@ func TestPluginPipeline_FullPipeline(t *testing.T) {
122121
}
123122

124123
var stderr bytes.Buffer
125-
debug := opts.DebugFromString("")
126-
debug.ProcessPlugins = true
127124
o := &Options{
128-
Env: Env{Debug: debug},
125+
Env: Env{},
129126
Stderr: &stderr,
130127
PluginParseFunc: pluginParse,
131128
CodegenHandlerOverride: mockCodegen,
@@ -239,10 +236,8 @@ func TestPluginPipeline_WithoutOverride_UsesPluginPackage(t *testing.T) {
239236
},
240237
}
241238
var stderr bytes.Buffer
242-
debug := opts.DebugFromString("")
243-
debug.ProcessPlugins = true
244239
o := &Options{
245-
Env: Env{Debug: debug},
240+
Env: Env{},
246241
Stderr: &stderr,
247242
PluginParseFunc: nil, // do not override — must use built-in engine process runner
248243
CodegenHandlerOverride: ext.HandleFunc(func(_ context.Context, _ *plugin.GenerateRequest) (*plugin.GenerateResponse, error) {
@@ -293,10 +288,8 @@ func TestPluginPipeline_NBlocksNCalls(t *testing.T) {
293288
Config: &conf, ConfigPath: "sqlc.yaml", Dir: ".",
294289
FileContents: map[string][]byte{"schema.sql": []byte(schemaContent), "query.sql": []byte(queryContent)},
295290
}
296-
debug := opts.DebugFromString("")
297-
debug.ProcessPlugins = true
298291
o := &Options{
299-
Env: Env{Debug: debug}, Stderr: &bytes.Buffer{}, PluginParseFunc: pluginParse,
292+
Env: Env{}, Stderr: &bytes.Buffer{}, PluginParseFunc: pluginParse,
300293
CodegenHandlerOverride: ext.HandleFunc(func(_ context.Context, req *plugin.GenerateRequest) (*plugin.GenerateResponse, error) {
301294
codegenReq = req
302295
return &plugin.GenerateResponse{}, nil
@@ -368,11 +361,13 @@ func TestPluginPipeline_DatabaseOnly_ReceivesNoSchema(t *testing.T) {
368361
Config: &conf, ConfigPath: "sqlc.yaml", Dir: ".",
369362
FileContents: map[string][]byte{"schema.sql": []byte("CREATE TABLE t (id INT);"), "query.sql": []byte(queryContent)},
370363
}
371-
debug := opts.DebugFromString("")
372-
debug.ProcessPlugins = true
373364
o := &Options{
374-
Env: Env{Debug: debug}, Stderr: &bytes.Buffer{}, PluginParseFunc: pluginParse,
375-
CodegenHandlerOverride: ext.HandleFunc(func(_ context.Context, req *plugin.GenerateRequest) (*plugin.GenerateResponse, error) { return &plugin.GenerateResponse{}, nil }),
365+
Env: Env{},
366+
Stderr: &bytes.Buffer{},
367+
PluginParseFunc: pluginParse,
368+
CodegenHandlerOverride: ext.HandleFunc(func(_ context.Context, req *plugin.GenerateRequest) (*plugin.GenerateResponse, error) {
369+
return &plugin.GenerateResponse{}, nil
370+
}),
376371
}
377372
_, err = generate(context.Background(), inputs, o)
378373
if err != nil {

0 commit comments

Comments
 (0)