Skip to content

IRSA-7432: Support POSITION() function #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
Merged

IRSA-7432: Support POSITION() function #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Query/ADQL_parser.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,10 @@ struct ADQL_parser : boost::spirit::qi::grammar<std::string::const_iterator,
boost::spirit::ascii::space_type>
cast_function;

boost::spirit::qi::rule<std::string::const_iterator, ADQL::Position_Function(),
boost::spirit::ascii::space_type>
position_function;

boost::spirit::qi::rule<std::string::const_iterator, ADQL::User_Defined_Function(),
boost::spirit::ascii::space_type>
user_defined_function;
Expand Down
11 changes: 9 additions & 2 deletions src/Query/ADQL_parser/ADQL_parser/init_factor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,17 @@ void ADQL_parser::init_factor() {
-('(' > unsigned_integer > ')') >> ')'];
cast_function.name("cast_function");

position_function %=
hold[ascii::no_case["POSITION"] >> '(' >> character_string_literal >>
&no_skip[boost::spirit::qi::space] >> ascii::no_case["IN"] >>
&no_skip[boost::spirit::qi::space] >> column_reference >> ')'];
position_function.name("position_function");

// FIXME: numeric_value_function should have
// numeric_geometry_function
numeric_value_function %= trig_function | math_function | cast_function |
non_predicate_geometry_function | user_defined_function |
sql_no_arg_function;
position_function | non_predicate_geometry_function |
user_defined_function | sql_no_arg_function;
numeric_value_function.name("numeric_value_function");
// Flipped the order here, because a value_expression can match a
// function name.
Expand Down Expand Up @@ -214,6 +220,7 @@ void ADQL_parser::init_factor() {
BOOST_SPIRIT_DEBUG_NODE(user_defined_function_param);
BOOST_SPIRIT_DEBUG_NODE(user_defined_function);
BOOST_SPIRIT_DEBUG_NODE(cast_function);
BOOST_SPIRIT_DEBUG_NODE(position_function);
BOOST_SPIRIT_DEBUG_NODE(numeric_value_function);
BOOST_SPIRIT_DEBUG_NODE(numeric_primary);
BOOST_SPIRIT_DEBUG_NODE(factor);
Expand Down
5 changes: 3 additions & 2 deletions src/Query/Query_Specification/Factor/Numeric_Primary/Numeric_Value_Function.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "../../User_Defined_Function_Wrap.hxx"
#include "Numeric_Value_Function/Cast_Function.hxx"
#include "Numeric_Value_Function/Math_Function.hxx"
#include "Numeric_Value_Function/Position_Function.hxx"
#include "Numeric_Value_Function/Trig_Function.hxx"

#include <boost/variant.hpp>
Expand All @@ -12,8 +13,8 @@ namespace ADQL {
class Numeric_Value_Function {
public:
typedef boost::variant<Trig_Function, Math_Function, Cast_Function,
Non_Predicate_Geometry_Function, User_Defined_Function_Wrap,
std::string>
Position_Function, Non_Predicate_Geometry_Function,
User_Defined_Function_Wrap, std::string>
Variant;
Variant variant;
bool empty() const;
Expand Down
12 changes: 11 additions & 1 deletion test/parse_adql.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,17 @@ int main(int argc, char *argv[]) {
// IRSA-5506 CAST as public.GEOGRAPHY
"SELECT ST_Distance(CAST(ST_Point(22.81210,-16.78450) AS "
"public.GEOGRAPHY), "
"COALESCE(p.poly, p.pt), 'f') as dist_to_point_meters FROM caom.plane p"
"COALESCE(p.poly, p.pt), 'f') as dist_to_point_meters FROM caom.plane p",

// IRSA-7432 POSITION(string IN column_value)
"SELECT CASE WHEN POSITION('s3.amazonaws.com' IN a.uri) > 0 THEN a.uri "
"ELSE 'https://bacchus1.ipac.caltech.edu/' || regexp_replace(a.uri, "
"'https.*edu/', '') END as access_url FROM caom.artifact a",

"SELECT POSITION('s3.amazonaws.com' IN a.uri) AS pos FROM caom.artifact a",

"SELECT artifactid FROM caom.artifact a WHERE POSITION('s3.amazonaws.com' "
"IN a.uri) > 0"

#endif // RUN_ALL
};
Expand Down