This commit is contained in:
2026-03-15 12:22:42 +01:00
parent cd99275933
commit 311ba5e7f3
558 changed files with 55182 additions and 22981 deletions

View File

@@ -1,5 +1,3 @@
[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=sidorares&url=https://github.com/sidorares/named-placeholders&title=named-placeholders&language=&tags=github&category=software)
[![NPM](https://nodei.co/npm/named-placeholders.png?downloads=true&stars=true)](https://nodei.co/npm/named-placeholders/)
[![CI](https://github.com/mysqljs/named-placeholders/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/mysqljs/named-placeholders/actions/workflows/ci.yml)
@@ -20,7 +18,7 @@ see [this mysql2 discussion](https://github.com/sidorares/node-mysql2/issues/117
var mysql = require('mysql');
var toUnnamed = require('named-placeholders')();
var q = toUnnamed('select 1+:test', { test: 123});
var q = toUnnamed('select 1+:test', { test: 123 });
mysql.createConnection().query(q[0], q[1]);
```

View File

@@ -4,9 +4,9 @@
// License: https://github.com/mscdex/node-mariasql/blob/master/LICENSE
const RE_PARAM = /(?:\?)|(?::(\d+|(?:[a-zA-Z][a-zA-Z0-9_]*)))/g,
DQUOTE = 34,
SQUOTE = 39,
BSLASH = 92;
DQUOTE = 34,
SQUOTE = 39,
BSLASH = 92;
function parse(query) {
let ppos = RE_PARAM.exec(query);
@@ -24,10 +24,9 @@ function parse(query) {
if (ppos) {
do {
for (i=curpos,end=ppos.index; i<end; ++i) {
let chr = query.charCodeAt(i);
if (chr === BSLASH)
escape = !escape;
for (i = curpos, end = ppos.index; i < end; ++i) {
const chr = query.charCodeAt(i);
if (chr === BSLASH) escape = !escape;
else {
if (escape) {
escape = false;
@@ -40,7 +39,7 @@ function parse(query) {
continue;
}
inQuote = false;
} else if (chr === DQUOTE || chr === SQUOTE) {
} else if (!inQuote && (chr === DQUOTE || chr === SQUOTE)) {
inQuote = true;
qchr = chr;
}
@@ -53,7 +52,7 @@ function parse(query) {
lastTokenEndPos = start;
}
curpos = end + ppos[0].length;
} while (ppos = RE_PARAM.exec(query));
} while ((ppos = RE_PARAM.exec(query)));
if (tokens.length) {
if (curpos < query.length) {
@@ -63,11 +62,10 @@ function parse(query) {
}
}
return [query];
};
}
function createCompiler(config) {
if (!config)
config = {};
if (!config) config = {};
if (!config.placeholder) {
config.placeholder = '?';
}
@@ -80,49 +78,51 @@ function createCompiler(config) {
cache = config.cache;
}
if (config.cache !== false && !cache) {
cache = new (require('lru-cache'))({ max: ncache });
cache = require('lru.min').createLRU({ max: ncache });
}
function toArrayParams(tree, params) {
const arr = [];
if (tree.length == 1) {
if (tree.length === 1) {
return [tree[0], []];
}
if (typeof params == 'undefined')
throw new Error('Named query contains placeholders, but parameters object is undefined');
if (typeof params === 'undefined')
throw new Error(
'Named query contains placeholders, but parameters object is undefined'
);
const tokens = tree[1];
for (let i=0; i < tokens.length; ++i) {
for (let i = 0; i < tokens.length; ++i) {
arr.push(params[tokens[i]]);
}
return [tree[0], arr];
}
function noTailingSemicolon(s) {
if (s.slice(-1) == ':') {
if (s.slice(-1) === ':') {
return s.slice(0, -1);
}
return s;
}
function join(tree) {
if (tree.length == 1) {
if (tree.length === 1) {
return tree;
}
let unnamed = noTailingSemicolon(tree[0][0]);
for (let i=1; i < tree[0].length; ++i) {
if (tree[0][i-1].slice(-1) == ':') {
for (let i = 1; i < tree[0].length; ++i) {
if (tree[0][i - 1].slice(-1) === ':') {
unnamed += config.placeholder;
}
unnamed += config.placeholder;
unnamed += noTailingSemicolon(tree[0][i]);
}
const last = tree[0][tree[0].length -1];
if (tree[0].length == tree[1].length) {
if (last.slice(-1) == ':') {
const last = tree[0][tree[0].length - 1];
if (tree[0].length === tree[1].length) {
if (last.slice(-1) === ':') {
unnamed += config.placeholder;
}
unnamed += config.placeholder;
@@ -133,10 +133,10 @@ function createCompiler(config) {
function compile(query, paramsObj) {
let tree;
if (cache && (tree = cache.get(query))) {
return toArrayParams(tree, paramsObj)
return toArrayParams(tree, paramsObj);
}
tree = join(parse(query));
if(cache) {
if (cache) {
cache.set(query, tree);
}
return toArrayParams(tree, paramsObj);
@@ -150,7 +150,7 @@ function createCompiler(config) {
function toNumbered(q, params) {
const tree = parse(q);
const paramsArr = [];
if (tree.length == 1) {
if (tree.length === 1) {
return [tree[0], paramsArr];
}
@@ -159,7 +159,7 @@ function toNumbered(q, params) {
let qs = '';
let varIndex;
const varNames = [];
for (let i=0; i < tree[0].length; ++i) {
for (let i = 0; i < tree[0].length; ++i) {
varIndex = pIndexes[tree[1][i]];
if (!varIndex) {
varIndex = ++pLastIndex;
@@ -167,12 +167,12 @@ function toNumbered(q, params) {
}
if (tree[1][i]) {
varNames[varIndex - 1] = tree[1][i];
qs += tree[0][i] + '$' + varIndex;
qs += `${tree[0][i]}$${varIndex}`;
} else {
qs += tree[0][i];
}
}
return [qs, varNames.map(n => params[n])];
return [qs, varNames.map((n) => params[n])];
}
module.exports = createCompiler;

View File

@@ -1,32 +1,36 @@
{
"name": "named-placeholders",
"version": "1.1.3",
"version": "1.1.6",
"description": "sql named placeholders to unnamed compiler",
"main": "index.js",
"scripts": {
"test": "mocha"
"test": "node --test",
"lint": "biome lint --error-on-warnings && prettier --check .",
"lint:fix": "biome lint --write && prettier --write .github/workflows/*.yml ."
},
"repository": {
"type": "git",
"url": "https://github.com/sidorares/named-placeholders"
"url": "https://github.com/mysqljs/named-placeholders"
},
"keywords": [
"sql",
"pdo",
"named",
"placeholders"
"placeholders",
"mysql",
"postgres"
],
"engines": {
"node": ">=12.0.0"
"node": ">=8.0.0"
},
"author": "Andrey Sidorov <sidorares@yandex.com>",
"files": [],
"license": "MIT",
"devDependencies": {
"mocha": "^5.2.0",
"should": "^13.2.3"
},
"dependencies": {
"lru-cache": "^7.14.1"
"lru.min": "^1.1.0"
},
"devDependencies": {
"@biomejs/biome": "^2.3.8",
"prettier": "^3.7.4"
}
}