Table transaction adds a field TxsHashFillField

cruanEzhou · cruanEzhou · commit 0700b88d9a94 · 2020-09-16T15:48:07.000+08:00
diff --git a/src/table.js b/src/table.js
@@ -19,7 +19,8 @@ class Table extends Submit {
 		this.exec = '';
 		this.field = null;
 		this.connect = ChainsqlAPI.connect;
-		this.cache = [];
+    this.cache = [];
+    this.txsHashFillField = null;
 	}
 
 	submit (cb) {
@@ -59,13 +60,18 @@ class Table extends Submit {
 	}
 }
 
-Table.prototype.insert = function(raw, field) {
+Table.prototype.insert = function(raw, autoField ,txsHashFillField) {
   if (!this.tab) throw chainsqlError('you must appoint the table name');
   if (this.exec !== '' && this.exec !== 'r_insert') throw chainsqlError('Object can not hava function insert');
   var that = this;
-  if (field) {
-    this.field = field;
+  if (autoField) {
+    this.field = autoField;
+  }
+
+  if (txsHashFillField) {
+    this.txsHashFillField = txsHashFillField;
   }
+
   if (Object.prototype.toString.call(raw) === '[object Array]') {
     raw.forEach(function(item) {
       that.query.push(item);
@@ -90,7 +96,7 @@ Table.prototype.insert = function(raw, field) {
   }
 }
 
-Table.prototype.update = function(raw,field) {
+Table.prototype.update = function(raw,field,txsHashFillField) {
   if (!this.tab) throw chainsqlError('you must appoint the table name');
   if (this.exec !== 'r_get') throw chainsqlError('Object can not hava function update');
   this.query.unshift(raw);
@@ -99,6 +105,10 @@ Table.prototype.update = function(raw,field) {
     this.field = field;
   }
 
+  if (txsHashFillField) {
+    this.txsHashFillField = txsHashFillField;
+  }
+
   this.exec = 'r_update';
   if (this.transaction) {
     this.cache.push({
@@ -397,10 +407,18 @@ Table.prototype.prepareJson = function() {
 		}],
 		tsType: 'SQLStatement'
 	};
-	if ( (that.exec == 'r_insert' || that.exec == 'r_update') && that.field) {
-		payment.autoFillField = convertStringToHex(that.field);
-	}
+	if ( (that.exec == 'r_insert' || that.exec == 'r_update') ) {
+
+    if(that.field){
+      payment.autoFillField = convertStringToHex(that.field);
+    }
 
+    if ( that.txsHashFillField) {
+      payment.txsHashFillField = convertStringToHex(that.txsHashFillField);
+    }
+
+  }
+  
 	return new Promise(function (resolve, reject) {
 		prepareTable(that, payment, resolve, reject);
 	});
diff --git a/src/tablePayment.js b/src/tablePayment.js
@@ -61,7 +61,8 @@ function createPaymentTransaction(paymentArgument) {
     AutoFillField:payment.autoFillField,
     Token:payment.token,
     StrictMode: payment.strictMode,
-    OperationRule: payment.operationRule
+    OperationRule: payment.operationRule,
+    TxsHashFillField:payment.txsHashFillField,
   }
   return txJSON;
 }
diff --git a/test/test.js b/test/test.js
@@ -25,7 +25,7 @@ var issuer = {
 	address: "znbWk4iuz2HL1e1Ux91TzYfFzJHGeYxBA4"	
 }
 
-var sTableName = "fasefa";
+var sTableName = "fasefa25";
 var sTableName2 = "b1";
 var sReName = "boy1234";
 var sTableName3 = "hijack12";
@@ -34,7 +34,7 @@ main();
 
 async function main(){
 	try {
-		 await c.connect('ws://127.0.0.1:6005');
+		 await c.connect('ws://127.0.0.1:7017');
 		//await c.connect('ws://101.201.40.124:5006');
 		console.log('连接成功');
 
@@ -143,9 +143,9 @@ async function testChainsql(){
 	// await testCreateTable();
 
 	// // //创建另一张表，用来测试rename,drop
-	await testCreateTable1();
-	// await testInsert();
-	// await testUpdate();
+	//await testCreateTable1();
+	//await testInsert();
+	await testUpdate();
 	// await testDelete();
 	// await testRename();
 	// await testGet();
@@ -204,8 +204,8 @@ var testCreateTable = async function() {
 var testCreateTable1 = async function() {
 	var raw = [
 		{'field':'id','type':'int','length':11,'PK':1,'NN':1,'default':''},
-		{'field':'name','type':'varchar','length':50,'default':null},
-		{'field':'age','type':'int'}
+		{'field':'name','type':'text','default':''},
+		{'field':'txnField','type':'text'}
 	];
 	var option = {
 		confidential: false
@@ -222,12 +222,10 @@ var testCreateTable1 = async function() {
 //重复插入的情况下报异常
 var testInsert = async function() {
 	var raw = [
-		{'id':1,'age': 333,'name':'hello'},
-		{'id':2,'age': 444,'name':'sss'},
-		{'id':3,'age': 555,'name':'rrr'}
+		{'id':7}
 	];
 	try {
-		var rs = await c.table(sTableName).insert(raw).submit({expect:'db_success'});
+		var rs = await c.table(sTableName).insert(raw,"name","txnField").submit({expect:'db_success'});
 		console.log("testInsert",rs);	
 	} catch (error) {
 		console.error(error);
@@ -236,7 +234,7 @@ var testInsert = async function() {
 
 var testUpdate = async function(){
 	try {
-		var rs = await c.table(sTableName).get({'id': 2}).update({'age':200}).submit({expect:'db_success'});
+		var rs = await c.table(sTableName).get({'id': 7}).update({'name':"26"},"name","txnField").submit({expect:'db_success'});
 		console.log("testUpdate",rs);	
 	} catch (error) {
 		console.error(error);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ function createPaymentTransaction(paymentArgument) {`
`61`	`61`	`AutoFillField:payment.autoFillField,`
`62`	`62`	`Token:payment.token,`
`63`	`63`	`StrictMode: payment.strictMode,`
`64`		`- OperationRule: payment.operationRule`
	`64`	`+ OperationRule: payment.operationRule,`
	`65`	`+ TxsHashFillField:payment.txsHashFillField,`
`65`	`66`	`}`
`66`	`67`	`return txJSON;`
`67`	`68`	`}`