Skip to content

Commit

Permalink
Ignore materialized and alias cols infered during HTTP prepare batch (#…
Browse files Browse the repository at this point in the history
…1214)

* ignore materialized and alias cols

during instantiation of the batch insert we construct all the columns,
there is no need to do it for materialized and alias columns as they are
non insertable

* fix indent

* add test case

* Update and rename mat_cols_test.go to materialized_column_test.go

---------

Co-authored-by: Kuba Kaflik <[email protected]>
  • Loading branch information
iyuroch and jkaflik authored Mar 14, 2024
1 parent 7e2272c commit 8cbc6a2
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 4 deletions.
13 changes: 9 additions & 4 deletions conn_http_batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,19 @@ func (h *httpConnect) prepareBatch(ctx context.Context, query string, opts drive
var colNames []string
for r.Next() {
var (
colName string
colType string
ignore string
colName string
colType string
default_type string
ignore string
)

if err = r.Scan(&colName, &colType, &ignore, &ignore, &ignore, &ignore, &ignore); err != nil {
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
}
colNames = append(colNames, colName)
columns[colName] = colType
}
Expand Down
77 changes: 77 additions & 0 deletions tests/std/materialized_column_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// Licensed to ClickHouse, Inc. under one or more contributor
// license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright
// ownership. ClickHouse, Inc. licenses this file to you under
// the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package std

import (
"fmt"
"math/big"
"strconv"
"testing"

"github.com/ClickHouse/clickhouse-go/v2"
clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestMaterializedColumnInsert(t *testing.T) {
dsns := map[string]clickhouse.Protocol{"Native": clickhouse.Native, "Http": clickhouse.HTTP}
useSSL, err := strconv.ParseBool(clickhouse_tests.GetEnv("CLICKHOUSE_USE_SSL", "false"))
require.NoError(t, err)
for name, protocol := range dsns {
t.Run(fmt.Sprintf("%s Protocol", name), func(t *testing.T) {
if conn, err := GetStdDSNConnection(protocol, useSSL, nil); assert.NoError(t, err) {
if !CheckMinServerVersion(conn, 21, 12, 0) {
t.Skip(fmt.Errorf("unsupported clickhouse version"))
return
}
const ddl = `
CREATE TABLE test_mat_cols (
Col1 Int128
, Col2 MATERIALIZED Col1 * 2
) Engine MergeTree() ORDER BY tuple()
`
defer func() {
conn.Exec("DROP TABLE test_mat_cols")
}()
_, err := conn.Exec(ddl)
require.NoError(t, err)
scope, err := conn.Begin()
require.NoError(t, err)
batch, err := scope.Prepare("INSERT INTO test_mat_cols")
require.NoError(t, err)
var (
col1Data = big.NewInt(128)
col2Data = big.NewInt(128 * 2)
)
_, err = batch.Exec(col1Data)
require.NoError(t, err)
require.NoError(t, scope.Commit())
var (
col1 big.Int
col2 big.Int
)
require.NoError(t, conn.QueryRow("SELECT * FROM test_mat_cols").Scan(&col1))
assert.Equal(t, *col1Data, col1)
require.NoError(t, conn.QueryRow("SELECT Col1, Col2 from test_mat_cols").Scan(&col1, &col2))
assert.Equal(t, *col1Data, col1)
assert.Equal(t, *col2Data, col2)
}
})
}
}

0 comments on commit 8cbc6a2

Please sign in to comment.