Merge branch 'main' into ignore-mat-alias-cols

Author: iyuroch

conn_http.go

@@ -26,7 +26,6 @@ import (
 	"database/sql/driver"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"mime/multipart"
 	"net"
@@ -86,7 +85,7 @@ func (rw HTTPReaderWriter) read(res *http.Response) ([]byte, error) {
 			if err := reader.Reset(res.Body); err != nil {
 				return nil, err
 			}
-			body, err := ioutil.ReadAll(reader)
+			body, err := io.ReadAll(reader)
 			if err != nil {
 				return nil, err
 			}
@@ -97,7 +96,7 @@ func (rw HTTPReaderWriter) read(res *http.Response) ([]byte, error) {
 			if err := rw.reader.(flate.Resetter).Reset(res.Body, nil); err != nil {
 				return nil, err
 			}
-			body, err := ioutil.ReadAll(reader)
+			body, err := io.ReadAll(reader)
 			if err != nil {
 				return nil, err
 			}
@@ -107,14 +106,14 @@ func (rw HTTPReaderWriter) read(res *http.Response) ([]byte, error) {
 			if err := reader.Reset(res.Body); err != nil {
 				return nil, err
 			}
-			body, err := ioutil.ReadAll(reader)
+			body, err := io.ReadAll(reader)
 			if err != nil {
 				return nil, err
 			}
 			return body, nil
 		}
 	}
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}

conn_http_async_insert.go

@@ -20,7 +20,6 @@ package clickhouse
 import (
 	"context"
 	"io"
-	"io/ioutil"
 )
 
 func (h *httpConnect) asyncInsert(ctx context.Context, query string, wait bool, args ...any) error {
@@ -43,7 +42,7 @@ func (h *httpConnect) asyncInsert(ctx context.Context, query string, wait bool,
 	if res != nil {
 		defer res.Body.Close()
 		// we don't care about result, so just discard it to reuse connection
-		_, _ = io.Copy(ioutil.Discard, res.Body)
+		_, _ = io.Copy(io.Discard, res.Body)
 	}
 
 	return err

conn_http_batch.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"regexp"
 	"strings"
 
@@ -73,10 +72,11 @@ func (h *httpConnect) prepareBatch(ctx context.Context, query string, opts drive
 		if err = r.Scan(&colName, &colType, &default_type, &ignore, &ignore, &ignore, &ignore); err != nil {
 			return nil, err
 		}
-		// // these column types cannot be specified in INSERT queries
-		// if default_type == "MATERIALIZED" || default_type == "ALIAS" {
-		// 	continue
-		// }
+		// these column types cannot be specified in INSERT queries
+		
+    if default_type == "MATERIALIZED" || default_type == "ALIAS" {
+		 	continue
+		}
 		colNames = append(colNames, colName)
 		columns[colName] = colType
 	}
@@ -230,7 +230,7 @@ func (b *httpBatch) Send() (err error) {
 	if res != nil {
 		defer res.Body.Close()
 		// we don't care about result, so just discard it to reuse connection
-		_, _ = io.Copy(ioutil.Discard, res.Body)
+		_, _ = io.Copy(io.Discard, res.Body)
 	}
 
 	return err

conn_http_exec.go

@@ -20,7 +20,6 @@ package clickhouse
 import (
 	"context"
 	"io"
-	"io/ioutil"
 )
 
 func (h *httpConnect) exec(ctx context.Context, query string, args ...any) error {
@@ -34,7 +33,7 @@ func (h *httpConnect) exec(ctx context.Context, query string, args ...any) error
 	if res != nil {
 		defer res.Body.Close()
 		// we don't care about result, so just discard it to reuse connection
-		_, _ = io.Copy(ioutil.Discard, res.Body)
+		_, _ = io.Copy(io.Discard, res.Body)
 	}
 
 	return err

examples/clickhouse_api/ssl.go

@@ -21,10 +21,10 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/ClickHouse/clickhouse-go/v2"
-	"io/ioutil"
 	"os"
 	"path"
+
+	"github.com/ClickHouse/clickhouse-go/v2"
 )
 
 func SSLVersion() error {
@@ -37,7 +37,7 @@ func SSLVersion() error {
 		return err
 	}
 	t := &tls.Config{}
-	caCert, err := ioutil.ReadFile(path.Join(cwd, "../../tests/resources/CAroot.crt"))
+	caCert, err := os.ReadFile(path.Join(cwd, "../../tests/resources/CAroot.crt"))
 	if err != nil {
 		return err
 	}

examples/std/ssl.go

@@ -22,10 +22,10 @@ import (
 	"crypto/x509"
 	"database/sql"
 	"fmt"
-	"github.com/ClickHouse/clickhouse-go/v2"
-	"io/ioutil"
 	"os"
 	"path"
+
+	"github.com/ClickHouse/clickhouse-go/v2"
 )
 
 func ConnectSSL() error {
@@ -38,7 +38,7 @@ func ConnectSSL() error {
 		return err
 	}
 	t := &tls.Config{}
-	caCert, err := ioutil.ReadFile(path.Join(cwd, "../../tests/resources/CAroot.crt"))
+	caCert, err := os.ReadFile(path.Join(cwd, "../../tests/resources/CAroot.crt"))
 	if err != nil {
 		return err
 	}