Skip to content

Commit

Permalink
materialize-databricks: rebase on main, pull in gazette/core#352
Browse files Browse the repository at this point in the history
  • Loading branch information
mdibaiee committed Nov 3, 2023
1 parent 8ca5b71 commit 6c4e60b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ require (
github.com/tidwall/gjson v1.16.0
github.com/xitongsys/parquet-go v1.6.2
github.com/xitongsys/parquet-go-source v0.0.0-20220527110425-ba4adb87a31b
go.gazette.dev/core v0.89.1-0.20231012132739-dfed675b7fd1
go.gazette.dev/core v0.89.1-0.20231026212052-d34c1d3ba509
go.mongodb.org/mongo-driver v1.12.1
golang.org/x/crypto v0.14.0
golang.org/x/oauth2 v0.13.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,8 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mE
go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
go.etcd.io/etcd/client/v3 v3.5.4 h1:p83BUL3tAYS0OT/r0qglgc3M1JjhM0diV8DSWAhVXv4=
go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
go.gazette.dev/core v0.89.1-0.20231012132739-dfed675b7fd1 h1:oRtrsDKboiCGeG0B6kJvaJ9KVAn7U797oGMGTqdHnwo=
go.gazette.dev/core v0.89.1-0.20231012132739-dfed675b7fd1/go.mod h1:/fdxqReMWKS26yROKEKDY8JlXjwz8TqeEZggpNwb5I0=
go.gazette.dev/core v0.89.1-0.20231026212052-d34c1d3ba509 h1:5XDQdsqVe03xY7B2JXx02RzLy+xE8VB8UDFNiYy1gDw=
go.gazette.dev/core v0.89.1-0.20231026212052-d34c1d3ba509/go.mod h1:pdChQZd77Kv4hkkZzB7nRUrTCJuug2GXv+ngfXjPK1k=
go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE=
go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
Expand Down
2 changes: 1 addition & 1 deletion materialize-databricks/sqlgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var databricksDialect = func() sql.Dialect {
},
"number": sql.PrimaryKeyMapper{
PrimaryKey: sql.NewStaticMapper("STRING"),
Delegate: sql.NewStaticMapper("DOUBLE", sql.WithElementConverter(sql.StdStrToFloat())),
Delegate: sql.NewStaticMapper("DOUBLE", sql.WithElementConverter(sql.StdStrToFloat("NaN", "Inf", "-Inf"))),
},
"date": sql.NewStaticMapper("DATE"),
"date-time": sql.NewStaticMapper("TIMESTAMP"),
Expand Down
2 changes: 1 addition & 1 deletion materialize-mysql/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ type transactor struct {
func prepareNewTransactor(
dialect sql.Dialect,
templates map[string]*template.Template,
) func(context.Context, *sql.Endpoint, sql.Fence, []sql.Table) (pm.Transactor, error) {
) func(context.Context, *sql.Endpoint, sql.Fence, []sql.Table, pm.Request_Open) (pm.Transactor, error) {
return func(
ctx context.Context,
ep *sql.Endpoint,
Expand Down
2 changes: 1 addition & 1 deletion materialize-sqlserver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ type transactor struct {

func prepareNewTransactor(
templates map[string]*template.Template,
) func(context.Context, *sql.Endpoint, sql.Fence, []sql.Table) (pm.Transactor, error) {
) func(context.Context, *sql.Endpoint, sql.Fence, []sql.Table, pm.Request_Open) (pm.Transactor, error) {
return func(
ctx context.Context,
ep *sql.Endpoint,
Expand Down

0 comments on commit 6c4e60b

Please sign in to comment.