merge chainges

luleigreat · luleigreat · commit 35ee80cd289e · 2019-04-11T09:27:55.000+08:00
diff --git a/chainsql/pom.xml b/chainsql/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.peersafe</groupId>
 	<artifactId>chainsql</artifactId>
-	<version>1.5.0</version>
+	<version>1.5.1</version>
 	<packaging>jar</packaging>
 	<name>ChainSQL JAVA API</name>
 	<url>https://github.com/chainsql/java-chainsql-api</url>
diff --git a/chainsql/src/test/java/com/peersafe/example/chainsql/TestChainsql.java b/chainsql/src/test/java/com/peersafe/example/chainsql/TestChainsql.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import com.peersafe.base.client.pubsub.Publisher.Callback;
@@ -64,7 +65,8 @@ private static void testChainSql() {
 //		test.insertAfterGrant();
 		
 		//根据sql语句查询，有签名检测
-//		test.testGetBySqlUser();
+
+		test.testGetBySqlUser();
 		
 		//根据sql语句查询，admin权限，无签名检测
 //		test.testGetBySqlAdmin();
@@ -188,9 +190,25 @@ public void testts() {
 	public void testCreateTable() {
 		List<String> args = Util.array("{'field':'id','type':'int','length':11,'PK':1,'NN':1,'UQ':1}",
 				"{'field':'name','type':'varchar','length':50,'default':null}", "{'field':'age','type':'int'}");
+		
+//		List<String> args = Util.array("{'field':'id','type':'decimal','length':1}");
 		JSONObject obj;
 		obj = c.createTable(sTableName,args,false).submit(SyncCond.db_success);
 		System.out.println("create result:" + obj);
+//		int number = 3;
+//		while(true) {
+//			List<String> args = Util.array("{'field':'id','type':'int','length':11,'PK':1,'NN':1,'UQ':1}",
+//					"{'field':'name','type':'varchar','length':50,'default':null}", "{'field':'age','type':'int'}");
+//			JSONObject obj;
+//			obj = c.createTable(sTableName + number++,args,false).submit();
+//			System.out.println("create result:" + obj);
+//			try {
+//				Thread.sleep(1000);
+//			} catch (InterruptedException e) {
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
+//		}
 	}
 
 	public void testinsert() {
@@ -247,7 +265,7 @@ public void testget() {
 		
 //		//查询单条数据
 //		 JSONObject obj = c.table(sTableName).get(Util.array("{id:1}")).withFields("[]").submit();
-		
+		c.use(rootAddress);
 		//查询所有数据
 		 JSONObject obj = c.table(sTableName).get(Util.array("{name:hello}")).submit();
 		 System.out.println("get result:" + obj);
@@ -298,26 +316,6 @@ public void testGetBySqlUser() {
 //			JSONObject obj = c.getBySqlUser("insert into t_" + ret.getString("nameInDB") + " values()");
 			System.out.println("get_sql_user sync result:" + obj);
 		}
-		
-//		c.getTableNameInDB(rootAddress, sTableName, new Callback<JSONObject>(){
-//
-//			@Override
-//			public void called(JSONObject args) {
-//				if(ret.has("nameInDB")) {
-//					String sql = "select * from t_" + ret.getString("nameInDB");
-//					c.getBySqlUser(sql,new Callback<JSONObject>() {
-//
-//						@Override
-//						public void called(JSONObject args) {
-//							System.out.println("get_sql_user async result:" + args);
-//						}
-//						
-//					});
-//					
-//				}
-//			}
-//			
-//		});
 	}
 	
 	public void grant() {
diff --git a/codegen/.settings/org.eclipse.core.resources.prefs b/codegen/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
