CovenantSQL · auxten · Mar 27, 2019 · Mar 21, 2019 · Mar 22, 2019 · Mar 22, 2019
diff --git a/Makefile b/Makefile
@@ -140,12 +140,6 @@ bin/cql-minerd:
 		-o bin/cql-minerd \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
 
-bin/cql-utils:
-	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client_simple_log)" \
-		-o bin/cql-utils \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
-
 bin/cql:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client_simple_log)" \
@@ -181,7 +175,7 @@ bp: bin/cqld.test bin/cqld
 
 miner: bin/cql-minerd.test bin/cql-minerd
 
-client: bin/cql-utils bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
+client: bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
 
 all: bp miner client
 
@@ -191,5 +185,5 @@ clean:
 	rm -f coverage.txt
 
 .PHONY: status start stop logs push push_testnet clean \
-	bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd bin/cql-utils \
+	bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd \
 	bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
diff --git a/client/README-zh.md b/client/README-zh.md
@@ -6,7 +6,7 @@
 
 ```bash
 $ go get github.com/CovenantSQL/CovenantSQL/client
-$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
+$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql
 ```
 
 然后在你的 go 代码中 import 第一个 `client` 包。
@@ -18,14 +18,14 @@ $ go get github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
 
 ### 生成默认的配置文件
 
-运行以下 `cql-utils` 命令，输入 master key（类似密码）来生成本地密钥对。等待几十秒，会在 `conf` 文件夹中，生成一个私钥文件和一个名为 `config.yaml` 的配置文件。
+运行以下 `cql` 命令，输入 master key（类似密码）来生成本地密钥对。等待几十秒，会在 `~/.cql` 文件夹中，生成一个私钥文件和一个名为 `config.yaml` 的配置文件。
 
 ```bash
-$ cql-utils -tool confgen -root conf
+$ cql generate config
 Generating key pair...
 Enter master key(press Enter for default: ""):
 ⏎
-Private key file: conf/private.key
+Private key file: ~/.cql/private.key
 Public key's hex: 025abec9b0072615170f4acf4a2fa1162a13864bb66bc3f140b29f6bf50ceafc75
 Generated key pair.
 Generating nonce...
@@ -35,7 +35,7 @@ nonce: {{1450338416 0 0 0} 26 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f31
 node id: 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f311b3c3d6374e514
 Generated nonce.
 Generating config file...
-Generated nonce.
+Generated config.
 ```
 
 有了配置文件之后，可以通过以下 go 代码来初始化 CovenantSQL 客户端：
@@ -100,4 +100,4 @@ dsn, err = client.Create(meta)
 
 ### 完整示例
 
-在以下目录中有一个简单示例和复杂示例可以参考 [示例](https://github.com/CovenantSQL/CovenantSQL/tree/develop/client/_example)
+在以下目录中有一个简单示例和复杂示例可以参考 [示例](https://github.com/CovenantSQL/CovenantSQL/tree/develop/client/_example)
diff --git a/client/README.md b/client/README.md
@@ -6,7 +6,7 @@ Make sure that `$GOPATH/bin` is in your `$PATH`
 
 ```bash
 $ go get github.com/CovenantSQL/CovenantSQL/client
-$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
+$ go get github.com/CovenantSQL/CovenantSQL/cmd/cql
 ```
 
 and import `client` package if you want to use it in your code.
@@ -18,14 +18,14 @@ You need to provide a config and a master key for initialization. The master key
 
 ### Generating Default Config File
 
-Run `cql-utils` like below. Enter a master key (like a password) for generating local key pair. After that, it may take a few seconds with a private key file and config.yaml file generated in `conf` folder.
+Run `cql` like below. Enter a master key (like a password) for generating local key pair. After that, it may take a few seconds with a private key file and config.yaml file generated in `~/.cql/` folder.
 
 ```bash
-$ cql-utils -tool confgen -root conf
+$ cql generate config
 Generating key pair...
 Enter master key(press Enter for default: ""):
 ⏎
-Private key file: conf/private.key
+Private key file: ~/.cql/private.key
 Public key's hex: 025abec9b0072615170f4acf4a2fa1162a13864bb66bc3f140b29f6bf50ceafc75
 Generated key pair.
 Generating nonce...
@@ -35,7 +35,7 @@ nonce: {{1450338416 0 0 0} 26 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f31
 node id: 0000002dd8bdb50ba0270642e4c4bc593c1630ef7784653f311b3c3d6374e514
 Generated nonce.
 Generating config file...
-Generated nonce.
+Generated config.
 ```
 
 After you prepare your master key and config file, CovenantSQL client can be initialized by:

diff --git a/client/driver.go b/client/driver.go
@@ -285,6 +285,9 @@ func Drop(dsn string) (txHash hash.Hash, err error) {
 
 	peerList.Delete(cfg.DatabaseID)
 
+	//TODO(laodouya) currently not supported
+	//err = errors.New("drop db current not support")
+
 	return
 }
 

diff --git a/cmd/cql-utils/README-zh.md b/cmd/cql-utils/README-zh.md
diff --git a/cmd/cql-utils/README.md b/cmd/cql-utils/README.md
diff --git a/cmd/cql-utils/addrgen.go b/cmd/cql-utils/addrgen.go
diff --git a/cmd/cql-utils/confgen.go b/cmd/cql-utils/confgen.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -285,6 +285,9 @@ func Drop(dsn string) (txHash hash.Hash, err error) { @@
     	peerList.Delete(cfg.DatabaseID)
+    	//TODO(laodouya) currently not supported
+    	//err = errors.New("drop db current not support")
     	return
     }
@@ Expand Down @@