Merge pull request #3120 from masatake/sql-fix-wrong-promise-area

SQL: fix a typo in the code deciding a promise area

Author: masatake

Units/parser-sql.r/sql_pgSQL_guest.d/expected.tags

@@ -1,10 +1,12 @@
 fun1	input.sql	/^CREATE OR REPLACE FUNCTION fun1() RETURNS VARCHAR AS '$/;"	f
 fun2	input.sql	/^CREATE OR REPLACE FUNCTION fun2() RETURNS VARCHAR LANGUAGE plpgsql AS $\$$/;"	f
 test	input.sql	/^CREATE FUNCTION test(keys text[], vals text[]) RETURNS text AS$/;"	f
+test2	input.sql	/^CREATE FUNCTION test2(keys text[], vals text[]) RETURNS text AS $ABCDEFGHIJKLMNOPQRSTUVWXYZ\$$/;"	f
 test1_var1	input.sql	/^	test1_var1 VARCHAR(64) := $$ABC$$;$/;"	v
 test1_var2	input.sql	/^	test1_var2 VARCHAR(64) := $xyz$XYZ$xyz$;$/;"	v
 test1_var3	input.sql	/^	test1_var3     INTEGER := 1;$/;"	v
 test2_var1	input.sql	/^	test2_var1 VARCHAR(64) := 'ABC2';$/;"	v
 test2_var2	input.sql	/^	test2_var2 VARCHAR(64) := 'XYZ2';$/;"	v
 test2_var3	input.sql	/^	test2_var3        INTEGER := 2;$/;"	v
 o	input.sql	/^	var o = {};$/;"	v
+q	input.sql	/^var q={}; return "{}";$/;"	v

Units/parser-sql.r/sql_pgSQL_guest.d/input.sql

@@ -31,3 +31,8 @@ $$
 	return JSON.stringify(o);
 $$
 LANGUAGE plv8 IMMUTABLE STRICT;
+
+CREATE FUNCTION test2(keys text[], vals text[]) RETURNS text AS $ABCDEFGHIJKLMNOPQRSTUVWXYZ$
+var q={}; return "{}";
+ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ LANGUAGE plv8 IMMUTABLE STRICT;
+-- The fist whitespace is needed to trigger the original bug.

parsers/sql.c

@@ -797,7 +797,7 @@ static tokenType parseDollarQuote (vString *const string, const int delimiter, i
 					linenum[END] = getInputLineNumber ();
 					offset[END]  = getInputLineOffset ();
 					if (offset[END] > len)
-						offset[END] =- len;
+						offset[END] -= len;
 					*promise = makePromise (NULL,
 											linenum [START], offset [START],
 											linenum [END], offset [END],