LeftVar always corresponds to Outer

2 files changed, 5 insertions, 1 deletions

diff --git a/ydb/library/yql/sql/pg/optimizer.cpp b/ydb/library/yql/sql/pg/optimizer.cpp
index 6837e4881d4..80f1143593e 100644
--- a/ydb/library/yql/sql/pg/optimizer.cpp
+++ b/ydb/library/yql/sql/pg/optimizer.cpp
@@ -216,6 +216,10 @@ int TPgOptimizer::MakeOutputJoin(TOutput& output, Path* path) {
 
         node.Inner = MakeOutputJoin(output, jpath->innerjoinpath);
         node.Outer = MakeOutputJoin(output, jpath->outerjoinpath);
+
+        if (!bms_is_member(left->varno, jpath->outerjoinpath->parent->relids)) {
+            std::swap(node.LeftVar, node.RightVar);
+        }
     }
 
     output.Nodes[id] = node;
diff --git a/ydb/library/yql/sql/pg/optimizer_ut.cpp b/ydb/library/yql/sql/pg/optimizer_ut.cpp
index 0bcfa3aaf41..554c7df15e7 100644
--- a/ydb/library/yql/sql/pg/optimizer_ut.cpp
+++ b/ydb/library/yql/sql/pg/optimizer_ut.cpp
@@ -37,7 +37,7 @@ Y_UNIT_TEST(PgJoinSearch2Rels) {
  Inner Join
  Loop Strategy
  Rels: [1,2]
- Op: a = b
+ Op: b = a
  {
   Node
   Rels: [2]