Skip to content

Commit

Permalink
commented out vtable entries for msOracleSpatialEscapePropertyName.
Browse files Browse the repository at this point in the history
By that we don't need the additional logic described below anymore

Revert "Enclose the sortby property in double quotes by putting the result of  msLayerEscapePropertyName into double quotes"

This reverts commit d5f89a3.
  • Loading branch information
micking committed Nov 10, 2017
1 parent 3735c36 commit d190791
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
13 changes: 1 addition & 12 deletions maplayer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1606,18 +1606,7 @@ char* msLayerBuildSQLOrderBy(layerObj *layer)
int i;
for(i=0;i<layer->sortBy.nProperties;i++) {
char* escaped = msLayerEscapePropertyName(layer, layer->sortBy.properties[i].item);
//Enclose property name in double quotes (if it isn't yet) to ensure that mixed case property names are supported
if (escaped[0] != '"')
{
size_t propertyLen = strlen(escaped);
escaped = msSmallRealloc(escaped, propertyLen + 3);
memmove(escaped + 1, escaped, propertyLen);
escaped[0] = '\"';
escaped[propertyLen+1] = '\"';
escaped[propertyLen + 2] = 0;

}
if (i > 0)
if( i > 0 )
strOrderBy = msStringConcatenate(strOrderBy, ", ");
strOrderBy = msStringConcatenate(strOrderBy, escaped);
if( layer->sortBy.properties[i].sortOrder == SORT_DESC )
Expand Down
4 changes: 2 additions & 2 deletions maporaclespatial.c
Original file line number Diff line number Diff line change
Expand Up @@ -3975,7 +3975,7 @@ PluginInitializeVirtualTable(layerVTableObj* vtable, layerObj *layer)
vtable->LayerApplyFilterToLayer = msLayerApplyCondSQLFilterToLayer;
vtable->LayerSetTimeFilter = msLayerMakeBackticsTimeFilter;
//vtable->LayerSetTimeFilter = msOracleSpatialLayerSetTimeFilter;
vtable->LayerEscapePropertyName = msOracleSpatialEscapePropertyName;
//vtable->LayerEscapePropertyName = msOracleSpatialEscapePropertyName;
/* layer->vtable->LayerGetNumFeatures, use default */
/* layer->vtable->LayerGetAutoProjection = msOracleSpatialLayerGetAutoProjection; Disabled until tested */
vtable->LayerEnablePaging = msOracleSpatialEnablePaging;
Expand Down Expand Up @@ -4009,7 +4009,7 @@ int msOracleSpatialLayerInitializeVirtualTable(layerObj *layer)
layer->vtable->LayerApplyFilterToLayer = msLayerApplyCondSQLFilterToLayer;
layer->vtable->LayerSetTimeFilter = msLayerMakeBackticsTimeFilter;
//layer->vtable->LayerSetTimeFilter = msOracleSpatialLayerSetTimeFilter;
layer->vtable->LayerEscapePropertyName = msOracleSpatialEscapePropertyName;
//layer->vtable->LayerEscapePropertyName = msOracleSpatialEscapePropertyName;
/* layer->vtable->LayerCreateItems, use default */
/* layer->vtable->LayerGetNumFeatures, use default */
/* layer->vtable->LayerGetAutoProjection = msOracleSpatialLayerGetAutoProjection; Disabled until tested */
Expand Down

0 comments on commit d190791

Please sign in to comment.