From 5fe769f4f4f87c4bb2b4ef323c1f9bf7e6ba1dda Mon Sep 17 00:00:00 2001 From: "wei.zou" Date: Thu, 28 Dec 2023 09:30:18 +0800 Subject: [PATCH] fix:Error prompts are unified into English prompts --- README.md | 43 +++++++--------- lib/OFInstance.js | 68 +++++++++++++++---------- lib/OFramework.js | 2 +- lib/instance/MySQLActionManager.js | 28 +++++----- lib/instance/PostgreSQLActionManager.js | 40 ++++++++------- lib/instance/SQLServerActionManager.js | 40 +++++++-------- lib/instance/SQLiteSQLActionManager.js | 36 ++++++------- lib/oParameters.js | 7 +-- lib/onela.js | 7 +-- package.json | 8 +-- 10 files changed, 145 insertions(+), 134 deletions(-) diff --git a/README.md b/README.md index 0a94b7d..484ad37 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ -### 重大更新：v2.0.0版本发布 +### 重大更新：v2.0版本发布 此版本重大更新，原有如果使用了V2.0.0之前的版本请注意，升级到最新版，最原有代码也需要微调。 @@ -20,10 +20,6 @@ 目前（v2.3.0）已经支持 MySQL、PostgreSQL、SQL Server、SQLite数据库 -**onela.js官网：https://onela.cn** - -![onela.js 技术交流QQ群二维码](https://raw.githubusercontent.com/zouwei/onela/master/doc/QQ-group-qr.png) - ### 步骤一：安装node模块（step 1 npm install node_modules） ~~~~~~ @@ -42,7 +38,7 @@ npm install tedious // SQL Server数据库 数据库的配置可以配置在config全局配置中，在初始化调用取出来就可以了了 -``` +``` json /** * 数据库配置，可以初始化多个数据库实例 */ @@ -73,9 +69,9 @@ let dbconfig = [{ -###步骤三：Onela ORM对象初始化（step 3 Onela ORM object initialization） +### 步骤三：Onela ORM对象初始化（step 3 Onela ORM object initialization） -~~~~~~ +~~~~~~ json const {Onela, OnelaBaseModel} = require("onela"); // 初始化Onela模块（建议全局初始化） Onela.init(dbconfig); @@ -85,7 +81,7 @@ Onela.init(dbconfig); ### 步骤四：单例（数据表）对象配置以及方法的扩展封装 -~~~~~ +~~~~~ json // 在OnelaBaseModel类中封装了常用的ORM方法 class ToDoManager extends OnelaBaseModel { // 可以在此自定义扩展方法（默认封装没有的方法） @@ -118,11 +114,11 @@ ToDoManager.configs = { -###步骤五：常用CRUD操作代码示例（step 5 Examples of common CRUD operation code） +### 步骤五：常用CRUD操作代码示例（step 5 Examples of common CRUD operation code） 到这一步骤，可以直接使用ORM的方法了，增删改查，包含事务处理。 -``` +``` json // 【重要】单例模式，数据表配置 ToDoManager.configs = { fields: [ @@ -260,7 +256,7 @@ Ok, you can now play happily~ There are several ways to apply the query to different business scenarios. Paging query, waterfall flow inquiries, Standard query -~~~~~~ +~~~ json //parameter let p = { "select": ["t.id"], //Specify the output field, query all fields, use t. * Or select attributes by default @@ -279,7 +275,7 @@ There are several ways to apply the query to different business scenarios. Pagin .catch(function (err) { reject(err); }); -~~~~~~ +~~~ @@ -287,7 +283,7 @@ There are several ways to apply the query to different business scenarios. Pagin There is also a new batch method db_instance.insertBatch(arr),The incoming value is an array of objects -~~~~~~ +~~~ json //parameter let p = { "name":"Sandy", @@ -304,7 +300,7 @@ There is also a new batch method db_instance.insertBatch(arr),The incoming value .catch(function (err) { reject(err); }); -~~~~~~ +~~~ @@ -312,7 +308,7 @@ There is also a new batch method db_instance.insertBatch(arr),The incoming value There are two main ways to update the field,replace or plus -~~~~~~ +~~~ json //parameter var p = { "update": [ @@ -337,7 +333,7 @@ There are two main ways to update the field,replace or plus .catch(function (err) { reject(err); }); -~~~~~~ +~~~ @@ -345,7 +341,7 @@ There are two main ways to update the field,replace or plus case when then else end 用法举例 -``` +``` json SQL示例：update todos set is_done=1,content= (CASE id WHEN 12381 THEN '修改结果A' WHEN 12384 THEN '修改结果B' END) where 1=1 and id in (12381, 12384); //parameter @@ -381,7 +377,7 @@ case when then else end 用法举例 Physical deletion, generally do not recommend this operation, it is recommended to delete the logic -~~~~~~ +~~~ json //parameter let p = { @@ -399,7 +395,7 @@ Physical deletion, generally do not recommend this operation, it is recommended .catch(function (err) { reject(err); }); -~~~~~~ +~~~ @@ -409,7 +405,7 @@ Physical deletion, generally do not recommend this operation, it is recommended Can only achieve local Transaction -~~~~~~ +~~~ json /** * 事务 */ @@ -440,10 +436,9 @@ ToDoManager.transaction().then(t => { t.rollback(); }); }); -~~~~~~ - +~~~ -**onela.js v1.*版本已经下线 +*onela.js v1 版本已经下线* ~~~~~ 在就版本中模块引用需要批量调整下(2.0.0之前的老版本兼容） diff --git a/lib/OFInstance.js b/lib/OFInstance.js index d9309b2..c3cb855 100644 --- a/lib/OFInstance.js +++ b/lib/OFInstance.js @@ -25,13 +25,15 @@ function Service(oodbc, _database, _instance) { this.db = dbsource; } else { - console.log('数据源实例配置节点识别错误，请检查' + _instance.toUpperCase() + '节点是否存在'); - throw new TypeError('数据源实例配置节点识别错误，请检查' + _instance.toUpperCase() + '节点是否存在'); + // 数据源实例配置节点识别错误，请检查{0}节点是否存在 + console.log('Data source instance configuration node identification error, please check whether the ' + _instance.toUpperCase() + ' node exists'); + throw new TypeError('Data source instance configuration node identification error, please check whether the ' + _instance.toUpperCase() + ' node exists'); } } else { - console.log('数据库类型节点配置识别错误，请检查' + this.database.toUpperCase() + '节点是否存在'); - throw new TypeError('数据库类型节点配置识别错误，请检查' + this.database.toUpperCase() + '节点是否存在'); + // 数据源实例配置节点识别错误，请检查{0}节点是否存在 + console.log('Data source instance configuration node identification error, please check whether the ' + this.database.toUpperCase() + ' node exists'); + throw new TypeError('Data source instance configuration node identification error, please check whether the ' + this.database.toUpperCase() + ' node exists'); } } @@ -60,11 +62,11 @@ function service(oodbc, _database, _instance) { var execute = function (instance, sql, parameters) { return new Promise(function (resolve, reject) { //执行对数据库的访问 - console.time('【onela】执行SQL时间'); + console.time('【onela】SQL execution time'); // 【onela】执行SQL时间 //console.log('执行sql', sql, '参数', parameters); if (instance) { instance.query(sql, parameters, function (err, doc) { - console.timeEnd('【onela】执行SQL时间'); + console.timeEnd('【onela】SQL execution time'); // 【onela】执行SQL时间 if (err) { reject(err); } @@ -74,7 +76,8 @@ var execute = function (instance, sql, parameters) { }); } else { - reject("数据库instance实例未正确指向，请检查oodbc数据实例配置和表结构配置（onelaInstanceConfig.json）的实例对照是否正确"); + // 数据库instance实例未正确指向，请检查oodbc数据实例配置和表结构配置（onelaInstanceConfig.json）的实例对照是否正确 + reject("The database instance is not pointed correctly. Please check whether the instance comparison between the oodbc data instance configuration and the table structure configuration (onelaInstanceConfig.json) is correct."); } }); } @@ -114,7 +117,7 @@ Service.prototype.queryWaterfallList = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 reject(err); }); }); @@ -137,7 +140,8 @@ Service.prototype.queryWaterfallList = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -186,7 +190,7 @@ Service.prototype.queryEntityList = function (paras) { resolve(result); }) .catch(function (err) { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 reject(err); }); @@ -210,7 +214,8 @@ Service.prototype.queryEntityList = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -248,7 +253,7 @@ Service.prototype.queryEntity = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 reject(err); }); }); @@ -271,7 +276,8 @@ Service.prototype.queryEntity = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -331,7 +337,7 @@ Service.prototype.statsByAggregate = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute查询统计信息出错', err); + console.log('Exception occurred when executing aggregation query', err); // 执行聚合查询出现异常 reject(err); }); @@ -354,7 +360,8 @@ Service.prototype.statsByAggregate = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -403,7 +410,7 @@ Service.prototype.insertion = function (paras) { resolve(paras.insertion); }) .catch(function (err) { - console.log('执行execute查询insert出错', err); + console.log('An error occurred when executing execute query insert.', err); // 执行execute查询insert出错 reject(err); }); @@ -426,7 +433,8 @@ Service.prototype.insertion = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -481,7 +489,7 @@ Service.prototype.insertionBatch = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 reject(err); }); }); @@ -503,7 +511,8 @@ Service.prototype.insertionBatch = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -534,7 +543,7 @@ Service.prototype.updateBySenior = function (paras) { * id等于空值，更新不成功，过滤错误参数导致的全表更新 * //paras.keyword = [{"key": "id", "value": "", "logic": "and", "operator": "="}]; */ - reject('paras.keyword更新条件（数组）必须存在条件'); + reject('`paras.keyword` update conditions (array) must exist conditions'); // paras.keyword更新条件（数组）必须存在条件 return; } /** @@ -564,7 +573,7 @@ Service.prototype.updateBySenior = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute操作updateBySenior出错', err); + console.log('An error occurred while executing execute operation updateBySenior', err); // 执行execute操作updateBySenior出错 reject(err); }); }); @@ -586,7 +595,8 @@ Service.prototype.updateBySenior = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -616,7 +626,7 @@ Service.prototype.deleteEntity = function (paras) { * id等于空值，更新不成功，过滤错误参数导致的全表更新 * //paras.keyword = [{"key": "id", "value": "", "logic": "and", "operator": "="}]; */ - reject('paras.keyword更新条件（数组）必须存在条件'); + reject('`paras.keyword` update conditions (array) must exist conditions'); // paras.keyword更新条件（数组）必须存在条件 return; } /** @@ -635,7 +645,7 @@ Service.prototype.deleteEntity = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute操作deleteEntity出错', err); + console.log('An error occurred during execute operation deleteEntity', err); // 执行execute操作deleteEntity出错 reject(err); }); @@ -658,7 +668,8 @@ Service.prototype.deleteEntity = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } @@ -761,7 +772,7 @@ Service.prototype.call = function (paras) { */ if (error.length > 0) { console.log('error', error); - reject("参数不正确"); + reject("Parameter error"); // 参数错误 return; } /** @@ -780,7 +791,7 @@ Service.prototype.call = function (paras) { resolve(data); }) .catch(function (err) { - console.log('执行execute查询proc出错', err); + console.log('An error occurred while executing execute query proc.', err);// 执行execute查询proc出错 reject(err); }); }); @@ -802,7 +813,8 @@ Service.prototype.call = function (paras) { }); } else { - reject('非常抱歉，OFranmework目前对' + database + '数据库还未支持！'); + // 非常抱歉，OFranmework目前对{0}数据库还未支持！ + reject('We are very sorry, OFranmework currently does not support the ' + database + ' database!'); } }); } diff --git a/lib/OFramework.js b/lib/OFramework.js index 57ae7e6..f39a070 100644 --- a/lib/OFramework.js +++ b/lib/OFramework.js @@ -488,7 +488,7 @@ var record = {}; */ m.getID = function (name, tp, cb) { //console.log(name); - var buf = new Buffer(12); + var buf = new Buffer.alloc(12); var host = 1;//process.env.RISKEYS_HOST; var pid = process.pid; var time = Math.round((new Date).getTime() / 1000); diff --git a/lib/instance/MySQLActionManager.js b/lib/instance/MySQLActionManager.js index 08b478a..28e7756 100644 --- a/lib/instance/MySQLActionManager.js +++ b/lib/instance/MySQLActionManager.js @@ -40,7 +40,7 @@ class MySQLActionManager extends BaseActionManager { let commit = () => { return new Promise(function (resolve, reject) { commit.transaction.client.commit(() => { - resolve("事务提交成功"); + resolve("Transaction submitted successfully"); // 事务提交成功 commit.transaction.client.release(() => { }); @@ -51,7 +51,7 @@ class MySQLActionManager extends BaseActionManager { let rollback = () => { return new Promise(function (resolve, reject) { rollback.transaction.client.rollback(() => { - resolve("事务已回滚"); + resolve("Transaction rolled back"); // 事务已回滚 rollback.transaction.client.release(() => { }); @@ -63,8 +63,8 @@ class MySQLActionManager extends BaseActionManager { return new Promise(function (resolve, reject) { self.conn.getConnection(function (err, connection) { if (err) { - console.log('创建事务连接出现异常', err); - reject(new Error('创建事务连接出现异常')); + console.log('An exception occurred when creating a transaction connection', err); // 创建事务连接出现异常 + reject(new Error('An exception occurred when creating a transaction connection')); // 创建事务连接出现异常 } else { // 事务对象 let _transaction = { @@ -110,7 +110,8 @@ class MySQLActionManager extends BaseActionManager { }); } else { - reject(new Error("数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致")); + // 数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致 + reject(new Error("The database instance engine instance is not pointed correctly. Please check whether the singleton configs configuration is consistent with the engine configured in dbconfig.")); } }); } @@ -135,7 +136,8 @@ class MySQLActionManager extends BaseActionManager { }); } else { - reject(new Error("数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致")); + // 数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致 + reject(new Error("The database instance engine instance is not pointed correctly. Please check whether the singleton configs configuration is consistent with the engine configured in dbconfig.")); } }); } @@ -156,14 +158,14 @@ class MySQLActionManager extends BaseActionManager { // 事务连接池 return self.executeTransaction(sql, p.parameters, option.transaction) .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } else { return self.execute(sql, p.parameters) .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -192,7 +194,7 @@ class MySQLActionManager extends BaseActionManager { ]).then(result => { return Promise.resolve({data: result[0], recordsTotal: result[1]}); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Error when executing execute query data list', ex); // 执行execute查询数据列表出错 return Promise.reject(ex); }); @@ -204,7 +206,7 @@ class MySQLActionManager extends BaseActionManager { ]).then(result => { return Promise.resolve({data: result[0], recordsTotal: result[1]}); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Error when executing execute query data list', ex); // 执行execute查询数据列表出错 return Promise.reject(ex); }); } @@ -253,7 +255,7 @@ class MySQLActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -275,7 +277,7 @@ class MySQLActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -362,7 +364,7 @@ class MySQLActionManager extends BaseActionManager { */ static deleteEntity(params, option = {"transaction": null}) { if ((!params.hasOwnProperty('keyword') || params.keyword.length == 0) && (!params.hasOwnProperty('where') || params.where.length == 0)) { - return Promise.reject('需要指定删除条件，防止整表数据误删除'); + return Promise.reject('Deletion conditions need to be specified to prevent the entire table data from being accidentally deleted.'); // 需要指定删除条件，防止整表数据误删除 } let p = GrammarMysql.getDeleteParameters(params); let sql = "delete from " + params.configs.tableName + " where " + p.where + ";"; diff --git a/lib/instance/PostgreSQLActionManager.js b/lib/instance/PostgreSQLActionManager.js index cdf5fdf..512d402 100644 --- a/lib/instance/PostgreSQLActionManager.js +++ b/lib/instance/PostgreSQLActionManager.js @@ -39,8 +39,8 @@ class PostgreSQLActionManager extends BaseActionManager { begin.transaction.client.query('BEGIN', (ex) => { if (ex) { begin.transaction.client.query('ROLLBACK', (err) => { - console.log('异常事务', err); - reject("开始事务出现异常") + console.log('Transaction exception!', err); // 事务异常 + reject("Transaction exception!") }); } else { @@ -59,7 +59,7 @@ class PostgreSQLActionManager extends BaseActionManager { console.error('Error committing transaction', err.stack) } commit.transaction.done(); - resolve("事务提交成功"); + resolve("Transaction submitted successfully!"); // 事务提交成功 }); }) }; @@ -74,7 +74,7 @@ class PostgreSQLActionManager extends BaseActionManager { } // release the client back to the pool rollback.transaction.done(); - resolve("事务已回滚") + resolve("Transaction rolled back!"); // 事务已回滚 }); }); }; @@ -83,8 +83,8 @@ class PostgreSQLActionManager extends BaseActionManager { // 创建事务连接 self.conn.connect((err, client, done) => { if (err) { - console.log('创建事务连接出现异常', err); - reject(new Error('创建事务连接出现异常')); + console.log('An exception occurred when creating a transaction connection', err); // 创建事务连接出现异常 + reject(new Error('An exception occurred when creating a transaction connection')); // An exception occurred when creating a transaction connection } else { // 事务对象 let _transaction = { @@ -135,7 +135,8 @@ class PostgreSQLActionManager extends BaseActionManager { }); } else { - reject(new Error("数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致")); + // 数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致 + reject(new Error("The database instance engine instance is not pointed correctly. Please check whether the singleton configs configuration is consistent with the engine configured in dbconfig.")); } }); } @@ -144,7 +145,7 @@ class PostgreSQLActionManager extends BaseActionManager { static executeTransaction(sql, parameters, transaction) { return new Promise((resolve, reject) => { - console.log('执行事务', sql); + console.log('Execute transaction', sql); // 执行事务 if (transaction && transaction.client) { //console.time("【onela】执行SQL时间"); // 事务连接池 @@ -156,7 +157,7 @@ class PostgreSQLActionManager extends BaseActionManager { transaction.client.query(query, function (err, doc) { //console.timeEnd("【onela】执行SQL时间"); if (err) { - console.log('异常', err) + console.log('Execution transaction exception!', err) reject(err); } else { @@ -165,7 +166,8 @@ class PostgreSQLActionManager extends BaseActionManager { }); } else { - reject(new Error("数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致")); + // 数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致 + reject(new Error("The database instance engine instance is not pointed correctly. Please check whether the singleton configs configuration is consistent with the engine configured in dbconfig.")); } }); } @@ -179,7 +181,7 @@ class PostgreSQLActionManager extends BaseActionManager { static queryEntity(params, option = {"transaction": null}) { let self = this; let p = GrammarMysql.getParameters(params); - console.log('参数》》', params.configs); + // console.log('参数》》', params.configs); let sql = "select " + p["select"] + " from " + params.configs.tableName + " as t " + p.where + p.orderBy + p.limit + ";"; // 执行SQL if (option && option.transaction) { @@ -189,7 +191,7 @@ class PostgreSQLActionManager extends BaseActionManager { return Promise.resolve(data.rows); }) .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -199,7 +201,7 @@ class PostgreSQLActionManager extends BaseActionManager { return Promise.resolve(data.rows); }) .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -224,7 +226,7 @@ class PostgreSQLActionManager extends BaseActionManager { */ let sql = "select " + p["select"] + " from " + params.configs.tableName + " t " + p.where + " " + p.orderBy + p.limit + ";"; let count_sql = "select count(0) total from " + params.configs.tableName + " t " + p.where; - console.log('事务对象', option.transaction); + console.log('onela transaction object:', option.transaction); //执行SQL if (option && option.transaction) { return Promise.all([ @@ -237,7 +239,7 @@ class PostgreSQLActionManager extends BaseActionManager { ]).then(result => { return Promise.resolve({data: result[0], recordsTotal: result[1]}); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Error when executing execute query data list', ex); // 执行execute查询数据列表出错 return Promise.reject(ex); }); @@ -253,7 +255,7 @@ class PostgreSQLActionManager extends BaseActionManager { ]).then(result => { return Promise.resolve({data: result[0], recordsTotal: result[1]}); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Error when executing execute query data list', ex); // 执行execute查询数据列表出错 return Promise.reject(ex); }); } @@ -303,7 +305,7 @@ class PostgreSQLActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -325,7 +327,7 @@ class PostgreSQLActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -416,7 +418,7 @@ class PostgreSQLActionManager extends BaseActionManager { */ static deleteEntity(params, option = {"transaction": null}) { if ((!params.hasOwnProperty('keyword') || params.keyword.length == 0) && (!params.hasOwnProperty('where') || params.where.length == 0)) { - return Promise.reject('需要指定删除条件，防止整表数据误删除'); + return Promise.reject('Deletion conditions need to be specified to prevent the entire table data from being accidentally deleted.'); // 需要指定删除条件，防止整表数据误删除 } let p = GrammarMysql.getDeleteParameters(params); let sql = "delete from " + params.configs.tableName + " where " + p.where + ";"; diff --git a/lib/instance/SQLServerActionManager.js b/lib/instance/SQLServerActionManager.js index 4ee89a7..4566ec7 100644 --- a/lib/instance/SQLServerActionManager.js +++ b/lib/instance/SQLServerActionManager.js @@ -58,7 +58,7 @@ class SQLServerActionManager extends BaseActionManager { return new Promise(function (resolve, reject) { commit.transaction.client.commitTransaction(() => { commit.transaction.client.close(); //记得关闭连接 - resolve("事务提交成功"); + resolve("Transaction submitted successfully"); // 事务提交成功 }); }) }; @@ -67,7 +67,7 @@ class SQLServerActionManager extends BaseActionManager { return new Promise(function (resolve, reject) { rollback.transaction.client.rollbackTransaction(() => { rollback.transaction.client.close(); //记得关闭连接 - resolve("事务已回滚"); + resolve("Transaction rolled back"); // 事务已回滚 }); }); }; @@ -78,9 +78,9 @@ class SQLServerActionManager extends BaseActionManager { let conn = new self.Connection(self.connectionCfg); conn.on('connect', function (err) { if (err) { - console.log("创建SQL Server事务访问连接出错", err); + console.log("Error creating SQL Server transaction access connection", err); // 创建SQL Server事务访问连接出错 } else { - console.log("已经创建SQL Server事务访问连接"); + console.log("SQL Server transaction access connection has been created"); // 已经创建SQL Server事务访问连接 // 事务对象 let _transaction = { @@ -101,8 +101,8 @@ class SQLServerActionManager extends BaseActionManager { // 执行SQL static execute(sql, parameters) { - console.log("执行SQL", sql); - console.log("参数", parameters); + // console.log("执行SQL", sql); + // console.log("参数", parameters); let self = this; return new Promise((resolve, reject) => { @@ -110,9 +110,9 @@ class SQLServerActionManager extends BaseActionManager { let conn = new self.Connection(self.connectionCfg); conn.on('connect', function (err) { if (err) { - console.log("SQL Server访问连接出错", err); + console.log("SQL Server access connection error", err); // SQL Server访问连接出错 } else { - console.log("已经创建SQL Server访问连接"); + console.log("SQL Server access connection has been created"); // 已经创建SQL Server访问连接 // 每次单独创建连接 /** * 执行SQL @@ -125,7 +125,7 @@ class SQLServerActionManager extends BaseActionManager { let request = new self.Request(sql, function (err, rowCount) { //判断有没有出错 if (err) { - console.log("创建SQL执行请求出错", err); + console.log("Error creating SQL execution request", err); // 创建SQL执行请求出错 return reject(err); } else rows['rowCount'] = rowCount; //rowCount是语句执行影响行数 @@ -182,7 +182,7 @@ class SQLServerActionManager extends BaseActionManager { request.on('error', function (err) { - console.log("出现错误", error); + console.log("SQL execution request error", error); // SQL执行请求出错 }); // 执行SQL @@ -207,7 +207,7 @@ class SQLServerActionManager extends BaseActionManager { let request = new self.Request(sql, function (err, rowCount) { //判断有没有出错 if (err) { - console.log("创建SQL执行请求出错", err); + console.log("Error creating SQL execution request", err); // 创建SQL执行请求出错 return reject(err); } else rows['rowCount'] = rowCount; //rowCount是语句执行影响行数 @@ -259,7 +259,7 @@ class SQLServerActionManager extends BaseActionManager { }); request.on('error', function (err) { - console.log("出现错误", error); + console.log("SQL execution request error", error); // SQL执行请求出错 }); // 事务：执行SQL @@ -284,7 +284,7 @@ class SQLServerActionManager extends BaseActionManager { return self.executeTransaction(sql, p.parameters, option.transaction).then(data => { return Promise.resolve(data.rows); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -292,7 +292,7 @@ class SQLServerActionManager extends BaseActionManager { return self.execute(sql, p.parameters).then(data => { return Promise.resolve(data.rows); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err);// 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -331,7 +331,7 @@ class SQLServerActionManager extends BaseActionManager { result.recordsTotal = [{ "total": data.rows[0].total }]; return Promise.resolve(result); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Error when executing execute query data list', ex); // 执行execute查询数据列表出错 return Promise.reject(ex); }); } @@ -347,7 +347,7 @@ class SQLServerActionManager extends BaseActionManager { result.recordsTotal = [{ "total": data.rows[0].total }]; return Promise.resolve(result); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Error when executing execute query data list', ex); // 执行execute查询数据列表出错 return Promise.reject(ex); }); } @@ -396,7 +396,7 @@ class SQLServerActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -418,7 +418,7 @@ class SQLServerActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Error when executing execute query data list', err); // 执行execute查询数据列表出错 return Promise.reject(err); }); } @@ -466,7 +466,7 @@ class SQLServerActionManager extends BaseActionManager { }); } else { - console.log("开始执行"); + // console.log("Start executing SQL write"); // 开始执行SQL写入 return this.execute(sql, p).then((data) => { // 返回浅拷贝 let insertion = Object.assign(params.insertion, { "_returns": data }); @@ -533,7 +533,7 @@ class SQLServerActionManager extends BaseActionManager { */ static deleteEntity(params, option = { "transaction": null }) { if ((!params.hasOwnProperty('keyword') || params.keyword.length == 0) && (!params.hasOwnProperty('where') || params.where.length == 0)) { - return Promise.reject('需要指定删除条件，防止整表数据误删除'); + return Promise.reject('Deletion conditions need to be specified to prevent the entire table data from being accidentally deleted.'); // 需要指定删除条件，防止整表数据误删除 } let p = GrammarParameter.getDeleteParameters(params); let sql = "delete from " + params.configs.tableName + " where " + p.where + ";"; diff --git a/lib/instance/SQLiteSQLActionManager.js b/lib/instance/SQLiteSQLActionManager.js index 41dce6a..68c5a24 100644 --- a/lib/instance/SQLiteSQLActionManager.js +++ b/lib/instance/SQLiteSQLActionManager.js @@ -15,7 +15,7 @@ class SQLiteActionManager extends BaseActionManager { * @param config */ static init(config) { - console.log('配置信息', config); + // console.log('配置信息', config); const SQLite3 = require('sqlite3').verbose(); @@ -24,8 +24,8 @@ class SQLiteActionManager extends BaseActionManager { // 打开的数据库对象（不存在则创建） this.conn = new SQLite3.Database(config.host, function (err) { - if (err) console.log("SQLite数据库连接异常", err); - else console.log("SQLite数据库连接成功"); + if (err) console.log("SQLite database connection exception", err); // SQLite数据库连接异常 + else console.log("SQLite database connection successful"); // SQLite数据库连接成功 }); } @@ -69,7 +69,7 @@ class SQLiteActionManager extends BaseActionManager { let commit = () => { return new Promise(function (resolve, reject) { commit.transaction.client.run("COMMIT"); - resolve("事务提交成功"); + resolve("Transaction submitted successfully"); // 事务提交成功 // () => { // t.client.release(() => { @@ -82,7 +82,7 @@ class SQLiteActionManager extends BaseActionManager { let rollback = () => { return new Promise(function (resolve, reject) { rollback.transaction.client.run("ROLLBACK"); - resolve("事务已回滚"); + resolve("Transaction rolled back"); // 事务已回滚 // t.client.rollback(() => { // t.client.release(() => { @@ -132,7 +132,7 @@ class SQLiteActionManager extends BaseActionManager { return new Promise(function (resolve, reject) { if (self.conn) { - console.time("【onela】执行SQL时间"); + console.time("【onela】SQL execution time"); //【onela】执行SQL时间 mode = mode == 'all' ? 'all' : (mode == 'get' ? 'get' : 'run'); self.conn[mode](sql, parameters, function (err, data) { //console.timeEnd("【onela】执行SQL时间"); @@ -149,7 +149,8 @@ class SQLiteActionManager extends BaseActionManager { }); } else { - reject(new Error("数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致")); + // 数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致 + reject(new Error("The database instance engine instance is not pointed correctly. Please check whether the singleton configs configuration is consistent with the engine configured in dbconfig.")); } }); } @@ -177,7 +178,8 @@ class SQLiteActionManager extends BaseActionManager { }); } else { - reject(new Error("数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致")); + // 数据库实例engine实例未正确指向，请检查单例configs配置是否跟dbconfig配置的engine一致 + reject(new Error("The database instance engine instance is not pointed correctly. Please check whether the singleton configs configuration is consistent with the engine configured in dbconfig.")); } }); } @@ -198,14 +200,14 @@ class SQLiteActionManager extends BaseActionManager { // 事务连接池 return self.executeTransaction(sql, parameters, option.transaction,"all") .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Exception when executing execute query data list', err); // 执行execute查询数据列表异常 return Promise.reject(err); }); } else { return self.execute(sql, parameters,"all") .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Exception when executing execute query data list', err); // 执行execute查询数据列表异常 return Promise.reject(err); }); } @@ -228,14 +230,14 @@ class SQLiteActionManager extends BaseActionManager { // 事务连接池 return self.executeTransaction(sql, p.parameters, option.transaction, "all") .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Exception when executing execute query data list', err); // 执行execute查询数据列表异常 return Promise.reject(err); }); } else { return self.execute(sql, p.parameters, "all") .catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Exception when executing execute query data list', err); // 执行execute查询数据列表异常 return Promise.reject(err); }); } @@ -264,7 +266,7 @@ class SQLiteActionManager extends BaseActionManager { ]).then(result => { return Promise.resolve({data: result[0], recordsTotal: result[1][0].total || 0}); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Exception when executing execute query data list', ex); // 执行execute查询数据列表异常 return Promise.reject(ex); }); @@ -277,7 +279,7 @@ class SQLiteActionManager extends BaseActionManager { return Promise.resolve({data: result[0], recordsTotal: result[1][0].total || 0}); }).catch(ex => { - console.log('执行execute查询数据列表出错', ex); + console.log('Exception when executing execute query data list', ex); // 执行execute查询数据列表异常 return Promise.reject(ex); }); } @@ -327,7 +329,7 @@ class SQLiteActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Exception when executing execute query data list', err); // 执行execute查询数据列表异常 return Promise.reject(err); }); } @@ -349,7 +351,7 @@ class SQLiteActionManager extends BaseActionManager { } return Promise.resolve(result); }).catch(err => { - console.log('执行execute查询数据列表出错', err); + console.log('Exception when executing execute query data list', err); // 执行execute查询数据列表异常 return Promise.reject(err); }); } @@ -436,7 +438,7 @@ class SQLiteActionManager extends BaseActionManager { */ static deleteEntity(params, option = {"transaction": null}) { if ((!params.hasOwnProperty('keyword') || params.keyword.length == 0) && (!params.hasOwnProperty('where') || params.where.length == 0)) { - return Promise.reject('需要指定删除条件，防止整表数据误删除'); + return Promise.reject('Deletion conditions need to be specified to prevent the entire table data from being accidentally deleted.'); // 需要指定删除条件，防止整表数据误删除 } let p = GrammarSqlite.getDeleteParameters(params); let sql = "delete from " + params.configs.tableName + " where " + p.where + ";"; diff --git a/lib/oParameters.js b/lib/oParameters.js index ce76ed0..b6ed54c 100644 --- a/lib/oParameters.js +++ b/lib/oParameters.js @@ -188,17 +188,15 @@ m.getUpdateParameters = function (paras) { } */ - if (paras.update[i] == '') { continue; } - //判断字段更新模式，常规更新还是case when then更新方式 if (paras.update[i].hasOwnProperty('case_field')) { //遍历节点 var item = paras.update[i]; - console.log('传入参数', item); + console.log('Pass in parameters', item); // var kkk = { // "key": "payment_no", // "case_field": "id", @@ -213,13 +211,12 @@ m.getUpdateParameters = function (paras) { continue; } - console.log('开始执行111'); + // console.log('开始执行111'); // balance = CASE id // WHEN '1' THEN balance+2 // WHEN '2' THEN balance+20 // END - //开头 var case_str = []; case_str.push(item.key + '= (CASE ' + item.case_field); diff --git a/lib/onela.js b/lib/onela.js index 627b0b4..7eb0817 100644 --- a/lib/onela.js +++ b/lib/onela.js @@ -44,7 +44,8 @@ class Onela { self._connections[tempConfig.engine] = temp_am; } else { - console.error("数据库实例类型", tempConfig.type, "不存在"); + // 数据库实例类型{0}不存在 + console.error("Database instance type ", tempConfig.type, " does not exist"); } } } @@ -406,7 +407,7 @@ class OnelaBaseModel { let params = Object.assign({}, args); if ((!params.hasOwnProperty('keyword') || params.keyword.length == 0) && (!params.hasOwnProperty('where') || params.where.length == 0)) { - return Promise.reject(new Error('paras.where更新条件（数组）必须存在条件')); + return Promise.reject(new Error('paras.where update condition (array) must exist condition')); // paras.where更新条件（数组）必须存在条件 } params.configs = this.configs; // 返回执行结果 @@ -479,7 +480,7 @@ class OnelaBaseModel { //支持此方法 return _connection.streak(sql, option); else - return Promise.reject(new Error("该类型数据库不支持streak方法")) + return Promise.reject(new Error("This type of database does not support the stream method")); // 该类型数据库不支持streak方法 }).catch(ex => { throw ex; diff --git a/package.json b/package.json index b6e925e..daa7d56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "onela", - "version": "2.4.5", + "version": "2.4.7", "description": "Onela is an object-based mapping framework based on node.js open source, supporting a variety of relational database data infrastructure. At the same time support a variety of database object read and write separation, the database instance vertical split. On top of the onela architecture you can experience the fun of programming without SQL, and you only need to focus on the business logic code section. And, I will be in the later version of the support to join the distributed cache to achieve the front and back end with node.js program to challenge the case of large-scale applications.", "main": "lib/onela.js", "scripts": { @@ -21,12 +21,12 @@ "SQL Server", "object relational mapper" ], - "author": "拾叶", + "author": "SHIYE", "license": "SHIYE", "maintainers": [ { - "name": "拾叶", - "email": "skylinetour@qq.com" + "name": "SHIYE", + "email": "huzougege@qq.com" } ], "dependencies": {}