Skip to content

this will now allow keyword tables like order #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

this will now allow keyword tables like order #20

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e3ca9
this will now allow keyword tables like
burtontanner Jun 15, 2018
33b3778
the back tick is not is the escapeIdentifier function. Npm test is wo…
burtontanner Jun 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions utilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ const identifierRegexp = /^[0-9,a-z,A-Z_.]*$/;

const escapeIdentifier = (str, quote) => {
quote = quote || '`';
if (identifierRegexp.test(str)) return str;
if (str === 'order') {
Copy link
Owner

@tshemsedinov tshemsedinov Jun 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why only order?

Copy link
Owner

@tshemsedinov tshemsedinov Jun 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

if (!reservedWords.includes(str) && identifierRegexp.test(str)) return str;
return '`' + str + '`';

quote = '`';
} else if (identifierRegexp.test(str)) return str;
return quote + str + quote;
};

Expand Down Expand Up @@ -482,8 +484,8 @@ const introspection = (connection) => {
//
connection.fields = function(table, callback) {
this.queryHash(
'SHOW FULL COLUMNS FROM `' +
escapeIdentifier(table) +'`', [],
'SHOW FULL COLUMNS FROM ' +
escapeIdentifier(table), [],
(err, res) => {
if (err) res = false;
callback(err, res);
Expand Down