Postgis parameter quoting and interpolation #31

Algunenano · 2018-01-30T10:11:54Z

Fixes #29

@uservar

- replace boost::regex with std::regex - use regex to match both !mapnikvar! and !@uservar! - no longer support @uservar (without surrounding !s)

unquote* just strip all quotes from both ends of the string, and don't collapse inner quotes. quote_attr doesn't duplicate inner quotes.

codecov-io · 2018-01-30T10:54:30Z

Codecov Report

Merging #31 into v3.0.15-carto will increase coverage by 0.17%.
The diff coverage is 30.44%.

@@                Coverage Diff                @@
##           v3.0.15-carto      #31      +/-   ##
=================================================
+ Coverage          65.18%   65.36%   +0.17%     
=================================================
  Files                438      438              
  Lines              21614    21597      -17     
=================================================
+ Hits               14089    14116      +27     
+ Misses              7525     7481      -44

Impacted Files	Coverage Δ
plugins/input/pgraster/pgraster_datasource.hpp	`0% <ø> (ø)`	⬆️
plugins/input/pgraster/pgraster_datasource.cpp	`0.92% <0%> (+0.03%)`	⬆️
include/mapnik/sql_utils.hpp	`100% <100%> (ø)`	⬆️
plugins/input/postgis/postgis_datasource.cpp	`79.06% <72.22%> (+3.25%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4261465...524b615. Read the comment docs.

lightmare and others added 11 commits January 30, 2018 11:17

sql_utils: on-the-fly quoting via operator <<

d201169

postgis: test query containing 'email@domain'

caba751

postgis: revamp substitution of special tokens in query

a27951e

- replace boost::regex with std::regex - use regex to match both !mapnikvar! and !@uservar! - no longer support @uservar (without surrounding !s)

postgis: test table/column names containing quotes

f405678

sql_utils: deprecate flawed un-quote functions

cf4e175

unquote* just strip all quotes from both ends of the string, and don't collapse inner quotes. quote_attr doesn't duplicate inner quotes.

sql_utils: improved table_from_sql

afc7b32

postgis: consistently quote parameters in sql

0b450e4

postgis: test !@uservar! interpolation

4416651

pgraster: indentation

78f0278

pgraster: copy quoting and interpolation changes from postgis

8bf7e4b

Update Changelog

524b615

Algunenano force-pushed the v3.0.15-carto_postgis_quoting branch from 9a0ac36 to 524b615 Compare January 30, 2018 10:18

Algunenano merged commit 6e36d61 into CartoDB:v3.0.15-carto Feb 2, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Postgis parameter quoting and interpolation #31

Postgis parameter quoting and interpolation #31

Algunenano commented Jan 30, 2018

codecov-io commented Jan 30, 2018 •

edited

Loading

Postgis parameter quoting and interpolation #31

Postgis parameter quoting and interpolation #31

Conversation

Algunenano commented Jan 30, 2018

codecov-io commented Jan 30, 2018 • edited Loading

Codecov Report

codecov-io commented Jan 30, 2018 •

edited

Loading