Skip to content
Permalink
Browse files

Merge pull request #3018 from rouault/wfs_sql

 [FEATURE] [WFS provider] Add support for WFS 2.0 joins and other improvements
  • Loading branch information
rouault committed May 13, 2016
2 parents 19f8060 + 65a37db commit d4d13a4a0a2b9b4b30a4ddaf876fa610d2b063ab
Showing with 9,982 additions and 495 deletions.
  1. +1 −0 python/core/core.sip
  2. +602 −0 python/core/qgssqlstatement.sip
  3. +4 −3 src/core/CMakeLists.txt
  4. +227 −17 src/core/qgsgml.cpp
  5. +38 −0 src/core/qgsgml.h
  6. +812 −1 src/core/qgsogcutils.cpp
  7. +108 −2 src/core/qgsogcutils.h
  8. +707 −0 src/core/qgssqlstatement.cpp
  9. +740 −0 src/core/qgssqlstatement.h
  10. +198 −0 src/core/qgssqlstatementlexer.ll
  11. +633 −0 src/core/qgssqlstatementparser.yy
  12. +1 −0 src/core/qgsvectorlayer.cpp
  13. +1 −0 src/core/qgsvectorlayer.h
  14. +4 −0 src/gui/CMakeLists.txt
  15. +45 −0 src/gui/qgscodeeditor.cpp
  16. +3 −0 src/gui/qgscodeeditor.h
  17. +17 −1 src/gui/qgscodeeditorsql.cpp
  18. +704 −0 src/gui/qgssqlcomposerdialog.cpp
  19. +189 −0 src/gui/qgssqlcomposerdialog.h
  20. +210 −0 src/providers/wfs/qgswfscapabilities.cpp
  21. +46 −1 src/providers/wfs/qgswfscapabilities.h
  22. +4 −1 src/providers/wfs/qgswfsconstants.cpp
  23. +3 −0 src/providers/wfs/qgswfsconstants.h
  24. +4 −2 src/providers/wfs/qgswfsdataitems.cpp
  25. +22 −2 src/providers/wfs/qgswfsdatasourceuri.cpp
  26. +13 −2 src/providers/wfs/qgswfsdatasourceuri.h
  27. +421 −132 src/providers/wfs/qgswfsfeatureiterator.cpp
  28. +49 −11 src/providers/wfs/qgswfsfeatureiterator.h
  29. +645 −100 src/providers/wfs/qgswfsprovider.cpp
  30. +22 −8 src/providers/wfs/qgswfsprovider.h
  31. +22 −1 src/providers/wfs/qgswfsrequest.cpp
  32. +8 −0 src/providers/wfs/qgswfsrequest.h
  33. +309 −94 src/providers/wfs/qgswfsshareddata.cpp
  34. +33 −13 src/providers/wfs/qgswfsshareddata.h
  35. +270 −48 src/providers/wfs/qgswfssourceselect.cpp
  36. +8 −2 src/providers/wfs/qgswfssourceselect.h
  37. +27 −2 src/providers/wfs/qgswfsutils.cpp
  38. +5 −0 src/providers/wfs/qgswfsutils.h
  39. +1 −1 src/ui/qgsoptionsbase.ui
  40. +460 −0 src/ui/qgssqlcomposerdialogbase.ui
  41. +143 −1 tests/src/core/testqgsgml.cpp
  42. +372 −0 tests/src/core/testqgsogcutils.cpp
  43. +1 −1 tests/src/gui/CMakeLists.txt
  44. +468 −0 tests/src/gui/testqgssqlcomposerdialog.cpp
  45. +2 −0 tests/src/python/CMakeLists.txt
  46. +879 −49 tests/src/python/test_provider_wfs.py
  47. +317 −0 tests/src/python/test_provider_wfs_gui.py
  48. +184 −0 tests/src/python/test_qgssqlstatement.py
@@ -127,6 +127,7 @@
%Include qgssnapper.sip
%Include qgssnappingutils.sip
%Include qgsspatialindex.sip
%Include qgssqlstatement.sip
%Include qgsstatisticalsummary.sip
%Include qgsstringstatisticalsummary.sip
%Include qgsstringutils.sip

0 comments on commit d4d13a4

Please sign in to comment.
You can’t perform that action at this time.