Fixed #29955 -- Added support for distance expression to the dwithin lookup.

[charettes]

This was missed when adding support to other distance lookups in refs #25499 (37d06cf)

Thanks Peter Bex for the report and Mariusz for the testcase.

[charettes]

Also included changes similar to 00db71d for Oracle support.

[charettes]

From a little investigation it looks like Oracle's SDO_WITHIN_DISTANCE operator doesn't support expressions and that the less performant SDO_GEOM.WITHIN_DISTANCE function must be used in these cases.

The thing is spatial operators don't have access to rhs to determine whether or not it's an expression (they simply get passed compiled SQL) so we'd need to override DWithinLookup.as_oracle to perform some different stuff if hasattr(dist_param, 'resolve_expression').

This is theoretical since I didn't manage to get an Oracle-GIS setup working locally and I'm frankly unsure of what SDO_GEOM.WITHIN_DISTANCE is expecting for dim1 and dim2 so I'd suggest we add a supports_dwithin_distance_expr = False feature flag for Oracle and move on for now.

[felixxm]

@jtiai Can you take a look on an Oracle-GIS issue?

[claudep]

I would suggest splitting the issue in two, and committing the non-Oracle part ASAP.

[felixxm]

Agreed, let's add a database feature for now. I tried different formats, e.g.

• ..., 'distance = '||%(value)s)
• ..., 'distance = %(value)s)'

but without any results.

[felixxm]

@charettes I added feature flag and an extra test for Oracle.

[claudep]

Looks good (failure is due to a recent commit of mine, unrelated to this patch). Thanks!

[felixxm]

@claudep Thanks! I sent separate PR to fix falling tests #11706 on Oracle.

[charettes]

Thanks for shepherding the commit to master @felixxm 🎉