-
Notifications
You must be signed in to change notification settings - Fork 675
Calling parser with backtick #1512
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.
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
Draft
lucioreyli
wants to merge
10
commits into
AlaSQL:v5
Choose a base branch
from
lucioreyli:develop
base: v5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
68d2766
feat: using backtick to call the function
lucioreyli 4c55fd7
feat: using backtick to call the function
lucioreyli 1101d7d
Merge branch 'AlaSQL:develop' into develop
lucioreyli a4bea43
Merge branch 'develop' into develop
lucioreyli 83cf559
feat: backtick call function
lucioreyli 32d4623
feat: finish basic support
lucioreyli 443ac9e
WIP starting the work testing model B
mathiasrw 632f548
Rename test files
mathiasrw a288f1e
format
mathiasrw 690b6e8
Merge branch 'v5' into develop
mathiasrw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,161 @@ | ||
if (typeof exports === 'object') { | ||
var assert = require('assert'); | ||
var alasql = require('../dist/alasql'); | ||
} | ||
|
||
describe('Issue #1723 - tagFunction for template strings', function () { | ||
it('Will mark free fields as parameters', function (done) { | ||
assert.deepEqual(tagBraid`SELECT 123 as abc`, ['SELECT 123 as abc']); | ||
assert.deepEqual(tagBraid`SELECT ${123} as abc`, ['SELECT ? as abc', [123]]); | ||
assert.deepEqual(tagBraid`${'SELECT'} ${123} as abc`, ['? ? as abc', ['SELECT', 123]]); | ||
assert.deepEqual(tagBraid`${'SELECT'} ${123} as ${'abc'}`, [ | ||
'? ? as ?', | ||
['SELECT', 123, 'abc'], | ||
]); | ||
done(); | ||
}); | ||
|
||
it('Will work second time when data is fetched from the cache', function (done) { | ||
assert.deepEqual(tagBraid`SELECT 123 as abc`, ['SELECT 123 as abc']); | ||
assert.deepEqual(tagBraid`SELECT ${123} as abc`, ['SELECT ? as abc', [123]]); | ||
assert.deepEqual(tagBraid`${'SELECT'} ${123} as abc`, ['? ? as abc', ['SELECT', 123]]); | ||
assert.deepEqual(tagBraid`${'SELECT'} ${123} as ${'abc'}`, [ | ||
'? ? as ?', | ||
['SELECT', 123, 'abc'], | ||
]); | ||
done(); | ||
}); | ||
|
||
it('Will inline connected fields', function (done) { | ||
assert.deepEqual(tagBraid`S${'ELECT'} 1${23} as ab${'c'}`, ['SELECT 123 as abc', []]); | ||
assert.deepEqual(tagBraid`SELECT 123 as ${'ab'}${'c'}`, ['SELECT 123 as abc', []]); | ||
done(); | ||
}); | ||
|
||
it('Will treat "()," as free space and become parameter', function (done) { | ||
assert.deepEqual(tagBraid`SELECT AVG(${1},${2},${3}) as abc`, [ | ||
'SELECT AVG(?,?,?) as abc', | ||
[1, 2, 3], | ||
]); | ||
done(); | ||
}); | ||
|
||
it('Can force free fields as inline', function (done) { | ||
assert.deepEqual(tagBraid`~${'SELECT'} ~${123} as abc`, ['SELECT 123 as abc', []]); | ||
assert.deepEqual(tagBraid`~${'SELECT'} ~${123} as ${'abc'}`, ['SELECT 123 as ?', ['abc']]); | ||
assert.deepEqual(tagBraid`${'SELECT'} ${123} as ~${'abc'}`, ['? ? as abc', ['SELECT', 123]]); | ||
assert.deepEqual(tagBraid`${'SELECT'} ${123} as ~${'abc'}~`, ['? ? as ~abc~', ['SELECT', 123]]); | ||
assert.deepEqual(tagBraid`SELECT AVG(~${1},~${2},${3}) as abc`, [ | ||
'SELECT AVG(1,2,?) as abc', | ||
[3], | ||
]); | ||
done(); | ||
}); | ||
|
||
it('Default to markring as parameter (option B from PR #1512)', function (done) { | ||
let items = `toys`; | ||
let type = 'Montessori'; | ||
let item = 'batman'; | ||
let orderBy = `ORDER BY x desc, y asc`; | ||
|
||
let res = tagBraid` | ||
SELECT author | ||
FROM ${items} | ||
WHERE | ||
AND type = ${type}_v2 | ||
AND name = ${item} | ||
~${orderBy} | ||
`; | ||
|
||
let expected = ` | ||
SELECT author | ||
FROM ? | ||
WHERE | ||
AND type = Montessori_v2 | ||
AND name = ? | ||
ORDER BY x desc, y asc | ||
`; | ||
assert.deepEqual(res, [expected, [`toys`, 'batman']]); | ||
done(); | ||
}); | ||
|
||
/*it('Will return a promise', async function (done) { | ||
let res = alasql`SELECT 123`; | ||
assert(typeof res.then === 'function'); | ||
assert.equal(await alasql`SELECT 123`.then((x) => 555), 555); | ||
done(); | ||
}); | ||
|
||
it('Will return the data from the query', async function (done) { | ||
assert.equal(await alasql`VAlUE OF SELECT 123`, 123); | ||
assert.deepEqual(await alasql`SELECT 123 as abc`, [{abc: 123}]); | ||
done(); | ||
}); | ||
|
||
it('Will inline string connected to other areas', async function (done) { | ||
assert.deepEqual(await alasql`SELECT 123 as abc`, [{abc: 123}]); | ||
done(); | ||
});*/ | ||
}); | ||
|
||
const re = { | ||
preFree: /[\(,\s]~?$/, | ||
postFree: /^[\),\s]/, | ||
}; | ||
|
||
const cache = new Map(); | ||
|
||
function tagBraid(template, ...params) { | ||
if ( | ||
!Array.isArray(template) || | ||
!Array.isArray(template.raw) || | ||
template.length - 1 != params.length | ||
) | ||
throw 'Please use as tagfunction to provide the right arguments'; | ||
|
||
if (1 == template.length) return [template[0]]; | ||
|
||
let sql = ''; | ||
|
||
let paramsIDs = []; | ||
if (cache[template.raw]) { | ||
({sql, paramsIDs} = cache.get(template.raw)); | ||
} else { | ||
for (let i = 0; i <= params.length; i++) { | ||
sql += template[i]; | ||
|
||
if (i === params.length) break; | ||
|
||
let inline = true; | ||
|
||
// if the field is "free" and not connected to other texts | ||
if ( | ||
(re.preFree.test(template[i]) || | ||
(0 === i && ('' === template[i] || '~' === template[i]))) && | ||
(re.postFree.test(template[i + 1]) || (params.length - 1 === i && '' === template[i + 1])) | ||
) { | ||
inline = false; | ||
// force inline if prepended with ~ | ||
if ('~'.charCodeAt(0) === template[i].charCodeAt(template[i].length - 1)) { | ||
sql = sql.slice(0, -1); | ||
inline = true; | ||
} | ||
} | ||
|
||
if (inline) { | ||
if (typeof params[i] !== 'number' && typeof params[i] !== 'string') | ||
console.error( | ||
'You are inlining a value that is not a string or a number so it might not work. Will proceed with the .toString() value but consider making space around the value so it can be provided as a parameter.', | ||
{parameter: params[i], template: template.raw} | ||
); | ||
sql += params[i].toString(); | ||
} else { | ||
sql += '?'; | ||
paramsIDs.push(i); | ||
} | ||
} | ||
cache.set(template.raw, {sql, paramsIDs}); | ||
} | ||
|
||
return [sql, [...paramsIDs.map((x) => params[x])]]; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
if (typeof exports === 'object') { | ||
var alasql = require('../dist/alasql'); | ||
} | ||
|
||
const table = { | ||
name: 'midnightcalls', | ||
columns: [ | ||
{name: 'track_name', type: 'string'}, | ||
{name: 'author', type: 'string'}, | ||
{name: 'views', type: 'int'}, | ||
], | ||
}; | ||
|
||
describe('Issue #1723 - Testing backtick call function', function () { | ||
it('1. Create table', function () { | ||
alasql`DROP TABLE IF EXISTS test`; | ||
alasql`CREATE TABLE test (a int, b int)`; | ||
}); | ||
|
||
it('2. Insert values ', function () { | ||
alasql`INSERT INTO test VALUES (1,1)`; | ||
alasql`INSERT INTO test VALUES (1,7)`; | ||
alasql`INSERT INTO test VALUES (2,2)`; | ||
alasql`INSERT INTO test VALUES (3,3)`; | ||
}); | ||
|
||
it('3. Create a new table', function () { | ||
alasql`DROP TABLE IF EXISTS ${table.name}`; | ||
|
||
alasql(` | ||
CREATE TABLE ${table.name} (${table.columns | ||
.map((item) => ` ${item.name} ${item.type.toUpperCase()}`) | ||
.join(', ') | ||
.toString()}) | ||
`); | ||
}); | ||
|
||
it('4. Insert values', function () { | ||
const values = [ | ||
['qhAfaWdLbIE', 'Baby bi', 'Yunk Vino', 72], | ||
['YA-db3f8Ak4', 'Sonar', 'Yunk Vino', 809], | ||
]; | ||
const valuesToInsert = values | ||
.map( | ||
(item, i) => | ||
`('${item[0]}', '${item[1]}', '${item[2]}', ${item[3]})${ | ||
i + 1 === values.length ? '' : ', ' | ||
}` | ||
) | ||
.join(''); | ||
|
||
//console.log(valuesToInsert); | ||
|
||
alasql(` | ||
INSERT INTO ${table.name} | ||
VALUES | ||
${valuesToInsert} | ||
`); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.