unify return value

luleigreat · luleigreat · commit 98223a6fd538 · 2019-03-01T11:57:10.000+08:00
diff --git a/src/index.js b/src/index.js
@@ -25,7 +25,6 @@ const getSequence = util.getSequence;
 const convertStringToHex = util.convertStringToHex;
 const getTableSequence = util.getTableSequence;
 const getUserToken = util.getUserToken;
-const getTableName = util.getTableName;
 const getTxJson = util.getTxJson;
 const generateToken = util.generateToken;
 const decodeToken = util.decodeToken;
@@ -785,11 +784,17 @@ ChainsqlAPI.prototype.signFor = function (json, secret, option) {
 
 ChainsqlAPI.prototype.getAccountTables = function(address, bGetDetailInfo=false){
 	var connection = this.api ? this.api.connection : this.connect.api.connection;
-	return connection.request({
-		command: 'g_accountTables',
-		account: address,
-		detail: bGetDetailInfo
-	});
+	return new Promise(function(resolve, reject){
+		connection.request({
+			command: 'g_accountTables',
+			account: address,
+			detail: bGetDetailInfo
+		}).then(function(data){
+			dealWithRet(data,resolve,reject);
+		}).catch(function(err){
+			reject(err);
+		})
+	})
 }
 
 ChainsqlAPI.prototype.getTableAuth = function(owner,tableName,accounts){
@@ -802,19 +807,49 @@ ChainsqlAPI.prototype.getTableAuth = function(owner,tableName,accounts){
 	if(accounts && accounts.length > 0){
 		req.accounts = accounts;
 	}
-	return connection.request(req);
+	return new Promise(function(resolve, reject){
+		connection.request(req).then(function(data){
+			dealWithRet(data,resolve,reject);
+		}).catch(function(err){
+			reject(err);
+		})
+	})
 }
 
+function dealWithRet(data,resolve,reject){
+	if(data.status == 'success'){
+		resolve(data);
+	}else{
+		reject(data);
+	}
+}
 ChainsqlAPI.prototype.getTableNameInDB = function(owner,tableName){
-	return util.getTableName(this,owner,tableName);
+	var that = this;
+	return new Promise(function(resolve, reject){
+		util.getTableName(that,owner,tableName).then(function(data){
+			if(data.status == 'success'){
+				resolve(data.nameInDB);
+			}else{
+				reject(data);
+			}
+		}).catch(function(err){
+			reject(err);
+		})
+	})
 }
 
 ChainsqlAPI.prototype.getBySqlAdmin = function(sql){
 	var connection = this.api ? this.api.connection : this.connect.api.connection;
-	return connection.request({
-		command: 'r_get_sql_admin',
-		sql:sql
-	});
+	return new Promise(function(resolve, reject){
+		connection.request({
+			command: 'r_get_sql_admin',
+			sql:sql
+		}).then(function(data){
+			dealWithRet(data,resolve,reject);
+		}).catch(function(err){
+			reject(err);
+		})
+	})
 }
 
 ChainsqlAPI.prototype.getBySqlUser = function(sql){
@@ -836,9 +871,9 @@ ChainsqlAPI.prototype.getBySqlUser = function(sql){
 					tx_json:json
 				})
 		}).then(function(data){
-			resolve(data);
+			dealWithRet(data,resolve,reject);
 		}).catch(function(err) {
-			reject(err, null);
+			reject(err);
 		});
 	})
 	
diff --git a/src/table.js b/src/table.js
@@ -12,7 +12,6 @@ const util = require('./util');
 const convertStringToHex = util.convertStringToHex;
 const getTableSequence = util.getTableSequence;
 const getUserToken = util.getUserToken;
-const getTableName = util.getTableName;
 const getTxJson = util.getTxJson;
 const generateToken = util.generateToken;
 const decodeToken = util.decodeToken;
@@ -456,7 +455,7 @@ function handleGetRecord(ChainSQL, object, resolve, reject) {
 			object(error, data)
 		} else {
 			if (error) {
-				resolve(error);
+				reject(error);
 			} else {
 				resolve(data);
 			}
@@ -488,9 +487,10 @@ function handleGetRecord(ChainSQL, object, resolve, reject) {
     })
   }).then(function(data) {
 		if (data.status != 'success'){
-			cb(new Error(data), null);
-    }
-		cb(null, {diff:data.diff,lines:data.lines});
+			cb(data, null);
+    }else{
+      cb(null, data);
+    }		
 	}).catch(function(err) {
 		cb(err, null);
 	})
diff --git a/src/util.js b/src/util.js
@@ -79,9 +79,7 @@ function getTableName(that,owner, name) {
     command: 'g_dbname',
     account: owner,
     tablename: name
-  }).then(function(data) {
-    return data.nameInDB;
-  })
+  });
 }
 
 function getUserToken(connection,owner,user,name) {
