From cbcfab851bbec79773591f51ad362c61ae6611f0 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Thu, 8 Aug 2024 18:42:13 +0200 Subject: [PATCH] Fix --- .../raw/compiler/rql2/tests/Rql2CompilerTestContext.scala | 6 ++++++ .../rql2/tests/builtin/credentials/MySQLPackageTest.scala | 4 ++-- .../rql2/tests/builtin/credentials/OraclePackageTest.scala | 2 +- .../tests/builtin/credentials/PostgreSQLPackageTest.scala | 4 ++-- .../tests/builtin/credentials/SQLServerPackageTest.scala | 4 ++-- .../tests/builtin/credentials/SnowflakePackageTest.scala | 4 ++-- .../rql2/tests/regressions/credentials/RD4445Test.scala | 3 ++- .../main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala | 4 ++-- .../scala/raw/compiler/rql2/builtin/OraclePackage.scala | 4 ++-- .../scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala | 4 ++-- .../scala/raw/compiler/rql2/builtin/SQLServerPackage.scala | 4 ++-- .../scala/raw/compiler/rql2/builtin/SnowflakePackage.scala | 4 ++-- 12 files changed, 27 insertions(+), 20 deletions(-) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala index 8c01d2036..375a9a3ce 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala @@ -22,6 +22,7 @@ import raw.compiler.base.source.{BaseProgram, Type} import raw.compiler.rql2.api.{Rql2CompilerServiceTestContext, Rql2OutputTestContext} import raw.inferrer.local.LocalInferrerTestContext import raw.protocol.{ + DropboxAccessTokenConfig, HttpHeadersConfig, LocationConfig, MySqlConfig, @@ -237,6 +238,11 @@ trait Rql2CompilerTestContext locationConfig(name, LocationConfig.newBuilder().setHttpHeaders(httpConfig).build()) } + def dropbox(name: String, cred: DropboxAccessTokenConfig): Unit = { + val dropboxConfig = LocationConfig.newBuilder().setDropboxAccessToken(cred).build() + locationConfig(name, dropboxConfig) + } + def option(key: String, value: String): Unit = { programOptions.put(key, value) } diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala index c8088a617..f7f48bca0 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala @@ -161,13 +161,13 @@ import raw.testing.tags.TruffleTests // no credentials test( s"""MySQL.InferAndRead("${mysqlCreds.getDatabase}", "$mysqlTable" )""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: ${mysqlCreds.getDatabase}""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: ${mysqlCreds.getDatabase}""".stripMargin)) test( s"""MySQL.Read("${mysqlCreds.getDatabase}", "$mysqlTable", | type collection(record(a: int, b: int, c: double, d: double, x: int, y: string)) |)""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: ${mysqlCreds.getDatabase}""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: ${mysqlCreds.getDatabase}""".stripMargin)) // server does not exist test( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala index 685c752ca..bddc5a8a7 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala @@ -117,7 +117,7 @@ import raw.testing.tags.TruffleTests // no credentials test( s"""Oracle.InferAndRead("$oracleDb", "$oracleSchema", "$oracleTable" )""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: $oracleDb""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: $oracleDb""".stripMargin)) test( s"""Oracle.Read("$oracleSchema", "rdbmstest", "$oracleTable", diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala index c135575bc..62bc05784 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala @@ -161,13 +161,13 @@ import raw.testing.tags.TruffleTests // no credentials test( s"""PostgreSQL.InferAndRead("${pgsqlCreds.getDatabase}", "$pgSchema", "$pgTable" )""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: ${pgsqlCreds.getDatabase}""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: ${pgsqlCreds.getDatabase}""".stripMargin)) test( s"""PostgreSQL.Read("${pgsqlCreds.getDatabase}", "$pgSchema", "$pgTable", | type collection(record(a: int, b: int, c: double, d: double, x: int, y: string)) |)""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: ${pgsqlCreds.getDatabase}""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: ${pgsqlCreds.getDatabase}""".stripMargin)) // server does not exist test( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala index 55d6ab8dc..1d50a22af 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala @@ -159,13 +159,13 @@ import raw.testing.tags.TruffleTests // no credentials test( s"""SQLServer.InferAndRead("$sqlServDb", "$sqlServSchema", "$sqlServTable" )""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: rawtest""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: rawtest""".stripMargin)) test( s"""SQLServer.Read("$sqlServDb", "$sqlServSchema", "$sqlServTable", | type collection(record(a: int, b: int, c: double, d: double, x: int, y: string)) |)""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: $sqlServDb""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: $sqlServDb""".stripMargin)) // server does not exist test( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala index 3d9b4e19e..21b49f418 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala @@ -266,7 +266,7 @@ import raw.testing.tags.TruffleTests s"""Snowflake.InferAndRead("${snowflakeCreds.getDatabase}", "$snowflakeSchema", "$snowflakeMainTable" )""".stripMargin )(it => it should runErrorAs( - s"""unknown database credential: ${snowflakeCreds.getDatabase}""".stripMargin + s"""unknown credential: ${snowflakeCreds.getDatabase}""".stripMargin ) ) @@ -274,7 +274,7 @@ import raw.testing.tags.TruffleTests s"""Snowflake.Read("${snowflakeCreds.getDatabase}", "$snowflakeSchema", "$snowflakeMainTable", | type collection(record(a: int, b: int, c: double, d: double, x: int, y: string)) |)""".stripMargin - )(it => it should runErrorAs(s"""unknown database credential: ${snowflakeCreds.getDatabase}""".stripMargin)) + )(it => it should runErrorAs(s"""unknown credential: ${snowflakeCreds.getDatabase}""".stripMargin)) // server does not exist test( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala index e718c2cd9..7c0cab651 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala @@ -13,6 +13,7 @@ package raw.compiler.rql2.tests.regressions.credentials import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext +import raw.protocol.DropboxAccessTokenConfig import raw.testing.tags.TruffleTests @TruffleTests class RD4445Test extends Rql2TruffleCompilerTestContext { @@ -21,7 +22,7 @@ import raw.testing.tags.TruffleTests property("raw.sources.dropbox.clientId", dropboxClientId) - httpHeaders("rawlabs-dropbox", Map("Authorization" -> ("Bearer " + dropboxLongLivedAccessToken))) + dropbox("rawlabs-dropbox", DropboxAccessTokenConfig.newBuilder().setAccessToken(dropboxLongLivedAccessToken).build()) test("""String.ReadLines("dropbox://rawlabs-dropbox/New folder/New Document")""")( _ should evaluateTo("""["Hello", "World", "Again!"]""") diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala index 90993bc07..198a02b9b 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala +++ b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala @@ -151,7 +151,7 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not a MySQL server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlTableInferrerProperties(location, None)) @@ -395,7 +395,7 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not a MySQL server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlQueryInferrerProperties(location, query, None)) diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala index cce7a41c0..5475fc3cd 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala +++ b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala @@ -171,7 +171,7 @@ class OracleInferAndReadEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not an Oracle server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlTableInferrerProperties(location, None)) @@ -424,7 +424,7 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not an Oracle server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlQueryInferrerProperties(location, query, None)) diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala index 22a45d625..3770f92ef 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala +++ b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala @@ -179,7 +179,7 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not a PostgreSQL server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlTableInferrerProperties(location, None)) @@ -434,7 +434,7 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not an Oracle server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlQueryInferrerProperties(location, query, None)) diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala index b68d1f3ed..1f57e1aab 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala +++ b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala @@ -180,7 +180,7 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not an Oracle server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlTableInferrerProperties(location, None)) @@ -436,7 +436,7 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not an Oracle server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlQueryInferrerProperties(location, query, None)) diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala index b51927c8e..fcbe1be09 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala +++ b/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala @@ -212,7 +212,7 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not a Snowflake server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlTableInferrerProperties(location, None)) @@ -502,7 +502,7 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { programContext.settings ) case Some(_) => return Left("not a Snowflake server") - case None => return Left(s"unknown database credential: $db") + case None => return Left(s"unknown credential: $db") } } Right(SqlQueryInferrerProperties(location, query, None))