Changeset: f93f01fe3b74 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f93f01fe3b74
Modified Files:
.github/workflows/linux.yml
sql/server/sql_parser.y
sql/server/sql_scan.c
Branch: default
Log Message:
fixed windows compilation
move to github v4 api's
diffs (72 lines):
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -43,7 +43,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
@@ -129,7 +129,7 @@ jobs:
- name: Tar files
run: tar -cvf mtests.tar mTests
- name: Publish mtest results
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: mtest-${{ github.sha }}-${{ matrix.os }}-${{ matrix.c_compiler
}}
path: mtests.tar
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -647,7 +647,7 @@ int yydebug=1;
sqlDECIMAL sqlFLOAT
TINYINT SMALLINT BIGINT HUGEINT sqlINTEGER
sqlDOUBLE sqlREAL PRECISION PARTIAL SIMPLE ACTION CASCADE RESTRICT
- BOOL BOOL_FALSE BOOL_TRUE
+ sqlBOOL BOOL_FALSE BOOL_TRUE
CURRENT_DATE CURRENT_TIMESTAMP CURRENT_TIME LOCALTIMESTAMP LOCALTIME
BIG LITTLE NATIVE ENDIAN
LEX_ERROR
@@ -5330,7 +5330,7 @@ literal:
}
$$ = _newAtomNode(a);
}
- | BOOL string
+ | sqlBOOL string
{ sql_subtype t;
atom *a = NULL;
int r;
@@ -5679,7 +5679,7 @@ data_type:
| aTYPE { sql_find_subtype(&$$, $1, 0, 0); }
| aTYPE '(' nonzero ')'
{ sql_find_subtype(&$$, $1, $3, 0); }
- | BOOL { sql_find_subtype(&$$, "boolean", 0, 0); }
+ | sqlBOOL { sql_find_subtype(&$$, "boolean", 0, 0); }
| ident_or_uident {
sql_type *t = mvc_bind_type(m, $1);
if (!t) {
@@ -5881,7 +5881,7 @@ non_reserved_word:
| ASC { $$ = sa_strdup(SA, "asc"); }
| AUTO_COMMIT { $$ = sa_strdup(SA, "auto_commit"); }
| BIG { $$ = sa_strdup(SA, "big"); }
-| BOOL { $$ = sa_strdup(SA, "bool"); }
+| sqlBOOL { $$ = sa_strdup(SA, "bool"); }
| CACHE { $$ = sa_strdup(SA, "cache"); }
| CENTURY { $$ = sa_strdup(SA, "century"); }
| CLIENT { $$ = sa_strdup(SA, "client"); }
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -121,7 +121,7 @@ scanner_init_keywords(void)
failed += keywords_insert("false", BOOL_FALSE);
failed += keywords_insert("true", BOOL_TRUE);
- failed += keywords_insert("bool", BOOL);
+ failed += keywords_insert("bool", sqlBOOL);
failed += keywords_insert("ALTER", ALTER);
failed += keywords_insert("ADD", ADD);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
