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 @@ -3660,14 +3660,9 @@ void RseNode::planCheck(const CompilerScratch* csb) const
36603660 {
36613661 const auto stream = node->getStream ();
36623662
3663- const auto relation = csb->csb_rpt [stream].csb_relation ;
3664- const auto procedure = csb->csb_rpt [stream].csb_procedure ;
3665- fb_assert (relation || procedure);
3666-
36673663 if (!csb->csb_rpt [stream].csb_plan )
36683664 {
3669- const auto name = relation ? relation->rel_name .toQuotedString () :
3670- procedure ? procedure->getName ().toQuotedString () : " " ;
3665+ const auto name = csb->csb_rpt [stream].getName (false ).toQuotedString ();
36713666
36723667 ERR_post (Arg::Gds (isc_no_stream_plan) << Arg::Str (name));
36733668 }
@@ -3729,9 +3724,7 @@ void RseNode::planSet(CompilerScratch* csb, PlanNode* plan)
37293724
37303725 if (tail->csb_map )
37313726 {
3732- auto tailName = tail->csb_relation ? tail->csb_relation ->rel_name :
3733- tail->csb_procedure ? tail->csb_procedure ->getName () :
3734- QualifiedName ();
3727+ auto tailName = tail->getName ();
37353728
37363729 // If the user has specified an alias, skip past it to find the alias
37373730 // for the base table (if multiple aliases are specified)
@@ -3842,10 +3835,7 @@ void RseNode::planSet(CompilerScratch* csb, PlanNode* plan)
38423835 }
38433836 else
38443837 {
3845- duplicateName =
3846- relation ? relation->rel_name :
3847- procedure ? procedure->getName () :
3848- QualifiedName ();
3838+ duplicateName = duplicateTail->getName ();
38493839
38503840 map = duplicateMap;
38513841 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