Skip to content

Commit 3d8e9c6

Browse files
committed
Merge remote-tracking branch 'origin/master' into resolve_datamodel_sync
2 parents 00177fa + 3cce5b1 commit 3d8e9c6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/scala/cognite/spark/v1/DefaultSource.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class DefaultSource
7171

7272
corePropertySyncRelation
7373
.orElse(corePropertyRelation)
74+
.orElse(datamodelBasedSync)
7475
.orElse(dataModelBasedConnectionRelation)
7576
.orElse(datamodelBasedSync)
7677
.orElse(dataModelBasedCorePropertyRelation)

src/test/scala/cognite/spark/v1/SequenceRowsRelationTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import cognite.spark.v1.CdpConnector.ioRuntime
44
import com.cognite.sdk.scala.v1.{Sequence, SequenceColumnCreate}
55
import io.scalaland.chimney.dsl._
66
import org.apache.spark.sql.{DataFrame, Row}
7-
import org.scalatest.{FlatSpec, Matchers, ParallelTestExecution}
7+
import org.scalatest.{FlatSpec, Matchers}
88

9-
class SequenceRowsRelationTest extends FlatSpec with Matchers with ParallelTestExecution with SparkTest {
9+
class SequenceRowsRelationTest extends FlatSpec with Matchers with SparkTest {
1010
import spark.implicits._
1111

1212
private val sequencesSourceDf = spark.read

0 commit comments

Comments
 (0)