fix ambiguity in macro column name

asarhaddon · Oct 25, 2024 · 175804c · 175804c
1 parent ee779bf
commit 175804c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/impls/plpgsql/step8_macros.sql b/impls/plpgsql/step8_macros.sql
@@ -233,15 +233,15 @@ BEGIN
         fast             integer;
         fparams          integer;
         fenv             integer;
-        macro            boolean;
+        fmacro           boolean;
         args             integer[] := ARRAY[]::integer[];
         result           integer;
         evda0   constant integer := mal.EVAL(a0, env);
     BEGIN
         SELECT type_id, val_string, ast_id, params_id, env_id, macro
-            INTO type, fname, fast, fparams, fenv, macro
+            INTO type, fname, fast, fparams, fenv, fmacro
             FROM types.value WHERE value_id = evda0;
-        IF macro THEN
+        IF fmacro THEN
             ast := types._apply(evda0, types._restArray(ast));
             CONTINUE; -- TCO
         END IF;

diff --git a/impls/plpgsql/step9_try.sql b/impls/plpgsql/step9_try.sql
@@ -256,15 +256,15 @@ BEGIN
         fast             integer;
         fparams          integer;
         fenv             integer;
-        macro            boolean;
+        fmacro           boolean;
         args             integer[] := ARRAY[]::integer[];
         result           integer;
         evda0   constant integer := mal.EVAL(a0, env);
     BEGIN
         SELECT type_id, val_string, ast_id, params_id, env_id, macro
-            INTO type, fname, fast, fparams, fenv, macro
+            INTO type, fname, fast, fparams, fenv, fmacro
             FROM types.value WHERE value_id = evda0;
-        IF macro THEN
+        IF fmacro THEN
             ast := types._apply(evda0, types._restArray(ast));
             CONTINUE; -- TCO
         END IF;

diff --git a/impls/plpgsql/stepA_mal.sql b/impls/plpgsql/stepA_mal.sql
@@ -256,15 +256,15 @@ BEGIN
         fast             integer;
         fparams          integer;
         fenv             integer;
-        macro            boolean;
+        fmacro           boolean;
         args             integer[] := ARRAY[]::integer[];
         result           integer;
         evda0   constant integer := mal.EVAL(a0, env);
     BEGIN
         SELECT type_id, val_string, ast_id, params_id, env_id, macro
-            INTO type, fname, fast, fparams, fenv, macro
+            INTO type, fname, fast, fparams, fenv, fmacro
             FROM types.value WHERE value_id = evda0;
-        IF macro THEN
+        IF fmacro THEN
             ast := types._apply(evda0, types._restArray(ast));
             CONTINUE; -- TCO
         END IF;