diff --git a/pkg/report/step_join.go b/pkg/report/step_join.go index 8f3bc962b..527329a19 100644 --- a/pkg/report/step_join.go +++ b/pkg/report/step_join.go @@ -50,6 +50,13 @@ func (j *stepJoin) Run(ctx context.Context, dd ...Datasource) (Datasource, error return nil, fmt.Errorf("foreign join datasources not defined: %s", j.def.LocalSource) } + // @todo temporarily disabled + for _, d := range dd { + if _, ok := d.(*joinedDataset); ok { + return nil, fmt.Errorf("unable to join a joined source: %s", d.Name()) + } + } + // @todo multiple joins return &joinedDataset{ def: j.def, @@ -399,6 +406,11 @@ func (d *joinedDataset) validateSort(def *FrameDefinition, dd FrameDescriptionSe } } + // @todo temporarily disabled + if sortDS != "" { + return fmt.Errorf("[temporary] initial sort can not by by a foreign column: %s", sortDS) + } + // The first one is always local so this is ok localDscr := dd[0] var dscr *FrameDescription diff --git a/tests/reporter/3002_joining_base_nested_test.go b/tests/reporter/3002_joining_base_nested_test.go index 5ac6f7b0a..e6c51b875 100644 --- a/tests/reporter/3002_joining_base_nested_test.go +++ b/tests/reporter/3002_joining_base_nested_test.go @@ -7,6 +7,9 @@ import ( ) func Test3002_joining_base_nested(t *testing.T) { + + t.Skip("@todo temporarily disabled") + var ( ctx, h, s = setup(t) m, _, dd = loadScenario(ctx, s, t, h) diff --git a/tests/reporter/3003_joining_base_nested_complex_test.go b/tests/reporter/3003_joining_base_nested_complex_test.go index 8acc89a03..a0451ef96 100644 --- a/tests/reporter/3003_joining_base_nested_complex_test.go +++ b/tests/reporter/3003_joining_base_nested_complex_test.go @@ -8,7 +8,7 @@ import ( func Test3003_joining_base_nested_complex(t *testing.T) { - t.Skip("@todo") + t.Skip("@todo temporarily disabled") var ( ctx, h, s = setup(t) diff --git a/tests/reporter/3006_joining_paging_nested_test.go b/tests/reporter/3006_joining_paging_nested_test.go index 7ae3f2352..591816790 100644 --- a/tests/reporter/3006_joining_paging_nested_test.go +++ b/tests/reporter/3006_joining_paging_nested_test.go @@ -7,6 +7,9 @@ import ( ) func Test3006_joining_paging_nested(t *testing.T) { + + t.Skip("@todo temporarily disabled") + var ( ctx, h, s = setup(t) m, _, dd = loadScenario(ctx, s, t, h)