Skip to content

Commit

Permalink
Merge pull request #267 from scala-steward/update/scalafmt-core-3.6.1
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.6.1
  • Loading branch information
JavierMonton authored Dec 11, 2022
2 parents 3ada2de + 037a0c4 commit 7533afd
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.6.1
11ccc6d55d3a7eac7b971450241a38965414ff93
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
runner.dialect = scala213source3
version = "3.5.9"
version = "3.6.1"
maxColumn = 120
docstrings.blankFirstLine = no
docstrings.style = SpaceAsterisk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,33 @@ package org.datatools.bigdatatypes.bigquery
import com.google.cloud.bigquery.Schema
import org.datatools.bigdatatypes.bigquery.JavaConverters.toJava

/**
* Public API for generating BigQuery Schemas.
/** Public API for generating BigQuery Schemas.
* Any type implementing [[SqlTypeToBigQuery]] or [[SqlInstanceToBigQuery]] can be converted into a BigQuery [[Schema]]
* If multiple types are given, the resulting schema will be the concatenation of them.
*/
object BigQuerySchemas {

/**
* Given any type that implements [[SqlTypeToBigQuery]] returns the BigQuery Schema for that type
/** Given any type that implements [[SqlTypeToBigQuery]] returns the BigQuery Schema for that type
* @tparam A is any type implementing [[SqlTypeToBigQuery]]
* @return [[Schema]] ready to be used in BigQuery
*/
def schema[A: SqlTypeToBigQuery]: Schema = BigQueryDefinitions.generateSchema[A]
def schema[A: SqlTypeToBigQuery, B: SqlTypeToBigQuery]: Schema = BigQueryDefinitions.generateSchema[A, B]
def schema[A: SqlTypeToBigQuery, B: SqlTypeToBigQuery, C: SqlTypeToBigQuery]: Schema = BigQueryDefinitions.generateSchema[A, B, C]
def schema[A: SqlTypeToBigQuery, B: SqlTypeToBigQuery, C: SqlTypeToBigQuery, D: SqlTypeToBigQuery]: Schema = BigQueryDefinitions.generateSchema[A, B, C, D]
def schema[A: SqlTypeToBigQuery, B: SqlTypeToBigQuery, C: SqlTypeToBigQuery, D: SqlTypeToBigQuery, E: SqlTypeToBigQuery]: Schema = BigQueryDefinitions.generateSchema[A, B, C, D, E]

/**
* Given an instance of a Product, extracts the BQ [[Schema]] from its type
def schema[A: SqlTypeToBigQuery, B: SqlTypeToBigQuery, C: SqlTypeToBigQuery]: Schema =
BigQueryDefinitions.generateSchema[A, B, C]

def schema[A: SqlTypeToBigQuery, B: SqlTypeToBigQuery, C: SqlTypeToBigQuery, D: SqlTypeToBigQuery]: Schema =
BigQueryDefinitions.generateSchema[A, B, C, D]

def schema[A: SqlTypeToBigQuery,
B: SqlTypeToBigQuery,
C: SqlTypeToBigQuery,
D: SqlTypeToBigQuery,
E: SqlTypeToBigQuery
]: Schema = BigQueryDefinitions.generateSchema[A, B, C, D, E]

/** Given an instance of a Product, extracts the BQ [[Schema]] from its type
* @param value an instance of any Product
* @tparam A is any Product type
* @return [[Schema]] with the same structure as the given input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ import org.datatools.bigdatatypes.bigquery.BigQueryDefinitions.{generateSchema,

import scala.util.{Failure, Try}

/**
* Methods in this object are creating real tables into a BigQuery environment.
/** Methods in this object are creating real tables into a BigQuery environment.
* If only the schema of the table is desired, please use [[BigQuerySchemas]]
*/
object BigQueryTable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,25 @@ class BigQuerySchemasSpec extends UnitSpec {
val elements1: Seq[Field] = List(
Field.newBuilder("a", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build()
)

val elements2: Seq[Field] = List(
Field.newBuilder("a", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("b", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build()
)

val elements3: Seq[Field] = List(
Field.newBuilder("a", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("b", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("c", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build()
)

val elements4: Seq[Field] = List(
Field.newBuilder("a", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("b", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("c", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("d", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build()
)

val elements5: Seq[Field] = List(
Field.newBuilder("a", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Field.newBuilder("b", StandardSQLTypeName.INT64).setMode(Mode.REQUIRED).build(),
Expand Down

0 comments on commit 7533afd

Please sign in to comment.