From 97ee1b91ef2a69c9e79bfa28dd94e438312f60b1 Mon Sep 17 00:00:00 2001 From: Stephanie Yang Date: Mon, 12 Jul 2021 21:08:42 -0500 Subject: [PATCH 1/2] wrap field and table names in backticks for sql queries --- lattice/src/App/Query/QueryContainer.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lattice/src/App/Query/QueryContainer.tsx b/lattice/src/App/Query/QueryContainer.tsx index bd1a41791..0911e3364 100644 --- a/lattice/src/App/Query/QueryContainer.tsx +++ b/lattice/src/App/Query/QueryContainer.tsx @@ -110,7 +110,13 @@ export const QueryContainer: FC<{}> = () => { setLoading(false); } } else { - querySQL(query, handleQueryMessages, handleQueryEnd); + let queryArr = query.split(' '); + queryArr.forEach((word, idx) => { + if (word.includes('-') && !word.includes('`')) { + queryArr[idx] = `\`${queryArr[idx]}\``; + } + }); + querySQL(queryArr.join(' '), handleQueryMessages, handleQueryEnd); } } }; From fa6e179193c0905e69b114d579f26ec28830bc01 Mon Sep 17 00:00:00 2001 From: Stephanie Yang Date: Tue, 13 Jul 2021 14:04:55 -0500 Subject: [PATCH 2/2] handle table-name.field-name syntax sql in console --- lattice/src/App/Query/QueryContainer.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lattice/src/App/Query/QueryContainer.tsx b/lattice/src/App/Query/QueryContainer.tsx index 0911e3364..7c102509c 100644 --- a/lattice/src/App/Query/QueryContainer.tsx +++ b/lattice/src/App/Query/QueryContainer.tsx @@ -112,8 +112,14 @@ export const QueryContainer: FC<{}> = () => { } else { let queryArr = query.split(' '); queryArr.forEach((word, idx) => { - if (word.includes('-') && !word.includes('`')) { - queryArr[idx] = `\`${queryArr[idx]}\``; + if (word.includes('-')) { + let wordArr = word.split('.'); + wordArr.forEach((section, idx) => { + if(section.includes('-') && !word.includes('`')) { + wordArr[idx] = `\`${wordArr[idx]}\``; + } + }) + queryArr[idx] = wordArr.join('.'); } }); querySQL(queryArr.join(' '), handleQueryMessages, handleQueryEnd);