File tree Expand file tree Collapse file tree 2 files changed +4
-13
lines changed
Expand file tree Collapse file tree 2 files changed +4
-13
lines changed Original file line number Diff line number Diff line change @@ -3646,14 +3646,9 @@ void RseNode::planCheck(const CompilerScratch* csb) const
36463646 {
36473647 const auto stream = node->getStream ();
36483648
3649- const auto relation = csb->csb_rpt [stream].csb_relation ;
3650- const auto procedure = csb->csb_rpt [stream].csb_procedure ;
3651- fb_assert (relation || procedure);
3652-
36533649 if (!csb->csb_rpt [stream].csb_plan )
36543650 {
3655- const auto name = relation ? relation->rel_name .toQuotedString () :
3656- procedure ? procedure->getName ().toQuotedString () : " " ;
3651+ const auto name = csb->csb_rpt [stream].getName (false ).toQuotedString ();
36573652
36583653 ERR_post (Arg::Gds (isc_no_stream_plan) << Arg::Str (name));
36593654 }
@@ -3715,9 +3710,7 @@ void RseNode::planSet(CompilerScratch* csb, PlanNode* plan)
37153710
37163711 if (tail->csb_map )
37173712 {
3718- auto tailName = tail->csb_relation ? tail->csb_relation ->rel_name :
3719- tail->csb_procedure ? tail->csb_procedure ->getName () :
3720- QualifiedName ();
3713+ auto tailName = tail->getName ();
37213714
37223715 // If the user has specified an alias, skip past it to find the alias
37233716 // for the base table (if multiple aliases are specified)
@@ -3828,10 +3821,7 @@ void RseNode::planSet(CompilerScratch* csb, PlanNode* plan)
38283821 }
38293822 else
38303823 {
3831- duplicateName =
3832- relation ? relation->rel_name :
3833- procedure ? procedure->getName () :
3834- QualifiedName ();
3824+ duplicateName = duplicateTail->getName ();
38353825
38363826 map = duplicateMap;
38373827 tail = duplicateTail;
Original file line number Diff line number Diff line change @@ -728,6 +728,7 @@ inline QualifiedName CompilerScratch::csb_repeat::getName(bool allowEmpty) const
728728 else if (csb_table_value_fun)
729729 return QualifiedName (csb_table_value_fun->name );
730730 // // TODO: LocalTableSourceNode
731+ // // TODO: JsonTableSourceNode
731732 else
732733 {
733734 fb_assert (allowEmpty);
You can’t perform that action at this time.
0 commit comments