[mapserver-commits] [mapserver/mapserver] e3c6d4: OGR GPKG: fix potential SELECT ambiguity for 'id' ...

[backporting[bot]]

  Branch: refs/heads/cherry-pick-backport-5860-to-branch-7-4-9fce3484-c635-4818-aa7b-5629e9bdb0d1
  Home:   https://github.com/mapserver/mapserver
  Commit: e3c6d479b7a79820882b0f858283f7b8decb39ba
      https://github.com/mapserver/mapserver/commit/e3c6d479b7a79820882b0f858283f7b8decb39ba
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2019-09-09 (Mon, 09 Sep 2019)

  Changed paths:
    M mapogr.cpp
    A msautotest/wxs/data/test.gpkg
    A msautotest/wxs/expected/wfs_ogr_gpkg_issue_5858.xml
    A msautotest/wxs/wfs_ogr_gpkg.map

  Log Message:
  -----------
  OGR GPKG: fix potential SELECT ambiguity for 'id' column (fixes #5858)

When using a GeoPackage table that has a 'id' column, in some circumstances,
MapServer composes internally a SELECT statement, but fails to prefix the
id column with the table name, which causes an ambiguity when joining with
the spatial index RTree table that has also a id column.


  Commit: 0afdd2e10b1497474574439dcd8444f54408ad88
      https://github.com/mapserver/mapserver/commit/0afdd2e10b1497474574439dcd8444f54408ad88
  Author: backporting[bot] <42222807+backporting[bot]@users.noreply.github.com>
  Date:   2019-09-09 (Mon, 09 Sep 2019)

  Changed paths:
    M mapogr.cpp
    A msautotest/wxs/data/test.gpkg
    A msautotest/wxs/expected/wfs_ogr_gpkg_issue_5858.xml
    A msautotest/wxs/wfs_ogr_gpkg.map

  Log Message:
  -----------
  Merge e3c6d479b7a79820882b0f858283f7b8decb39ba into cherry-pick-backport-5860-to-branch-7-4-9fce3484-c635-4818-aa7b-5629e9bdb0d1 [skip ci]

skip-checks: true


Compare: https://github.com/mapserver/mapserver/compare/da97e10ed22c...0afdd2e10b14