Merge branch 'main' into modify_display

databendlabs · Jun 15, 2023 · c0399bb · c0399bb
2 parents 813a607 + b9c38da
commit c0399bb
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -125,6 +125,59 @@ We can use `.CMD_NAME VAL` to update the `Settings` above in runtime, example:
 :) .max_display_rows 10
 ```
 
+## DSN
+
+Format:
+```
+databend[+flight]://user:[password]@host[:port]/[database][?sslmode=disabled][&arg1=value1]
+```
+
+Examples:
+
+- `databend://root:@localhost:8000/?sslmode=disable`
+
+- `databend://user1:password1@tnxxxx--default.gw.aws-us-east-2.default.databend.com:443/benchmark?enable_dphyp=1`
+
+- `databend+flight://root:@localhost:8900/database1?connect_timeout=10`
+
+
+Available Args:
+
+Common:
+
+| Arg | Description |
+|---|---|
+| `tenant` | Tenant ID, Databend Cloud only. |
+| `warehouse` | Warehouse name, Databend Cloud only. |
+| `sslmode` | Set to `disable` if not using tls |
+
+
+RestAPI client:
+
+| Arg | Description |
+|---|---|
+| `presigned_url_disabled` | Set to `1` to disable presigned upload to object storage, *should only be used with local testing environment* |
+| `wait_time_secs` | Request wait time for page, default to `1` |
+| `max_rows_in_buffer` | Max rows for page buffer |
+| `max_rows_per_page` | Max response rows for a single page |
+
+
+FlightSQL client:
+
+| Arg | Description |
+|---|---|
+| `connect_timeout` | Grpc connect timeout seconds |
+| `query_timeout` | Query timeout seconds |
+| `tcp_nodelay` | Default to `true` |
+| `tcp_keepalive` | Tcp keepalive seconds, default to `3600`, set to `0` to disable keepalive |
+| `http2_keep_alive_interval` | Keep alive interval in seconds, default to `300` |
+| `keep_alive_timeout` | Keep alive timeout in seconds, default to `20` |
+| `keep_alive_while_idle` | Default to `true` |
+
+Query Settings:
+
+see: [Databend Query Settings](https://databend.rs/doc/sql-commands/show/show-settings)
+
 
 ## Development
 

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bendsql"
-version = "0.3.10"
+version = "0.3.11"
 edition = "2021"
 license = "Apache-2.0"
 description = "Databend Native Command Line Tool"
@@ -11,7 +11,6 @@ repository = "https://github.com/datafuselabs/databend-client"
 [dependencies]
 anyhow = "1.0.70"
 async-trait = "0.1.68"
-atty = "0.2.14"
 chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
 clap = { version = "4.1.0", features = ["derive", "env"] }
 comfy-table = "6.1.4"

diff --git a/cli/README.md b/cli/README.md
@@ -39,8 +39,6 @@ Options:
   -V, --version              Print version
 ```
 
-## Examples
-
 ### REPL
 ```sql
 ❯ bendsql

diff --git a/cli/src/ast/tokenizer.rs b/cli/src/ast/tokenizer.rs
@@ -114,6 +114,9 @@ pub enum TokenKind {
     #[regex(r#"[_a-zA-Z][_$a-zA-Z0-9]*"#)]
     Ident,
 
+    #[regex(r#"\$[0-9]+"#)]
+    ColumnPosition,
+
     #[regex(r#"`[^`]*`"#)]
     #[regex(r#""([^"\\]|\\.|"")*""#)]
     #[regex(r#"'([^'\\]|\\.|'')*'"#)]

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -20,7 +20,10 @@ mod display;
 mod helper;
 mod session;
 
-use std::{collections::BTreeMap, io::stdin};
+use std::{
+    collections::BTreeMap,
+    io::{stdin, IsTerminal},
+};
 
 use anyhow::{anyhow, Result};
 use clap::{CommandFactory, Parser, ValueEnum};
@@ -264,8 +267,8 @@ pub async fn main() -> Result<()> {
         }
     };
     let mut settings = Settings::default();
-
-    let is_repl = atty::is(atty::Stream::Stdin) && !args.non_interactive && args.query.is_none();
+    let is_terminal = stdin().is_terminal();
+    let is_repl = is_terminal && !args.non_interactive && args.query.is_none();
     if is_repl {
         settings.display_pretty_sql = true;
         settings.show_progress = true;

diff --git a/driver/tests/driver/select_simple.rs b/driver/tests/driver/select_simple.rs
@@ -135,14 +135,14 @@ async fn select_decimal() {
             Value::Number(NumberValue::Decimal128(
                 100i128,
                 DecimalSize {
-                    precision: 15,
+                    precision: 3,
                     scale: 2
                 },
             )),
             Value::Number(NumberValue::Decimal128(
                 50i128,
                 DecimalSize {
-                    precision: 3,
+                    precision: 2,
                     scale: 1
                 },
             )),

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,4 @@
 [toolchain]
 channel = "stable"
+date = "2023-06-01"
 components = ["rustfmt", "clippy"]