diff --git a/.github/composite-actions/install-and-run-dotnet/action.yml b/.github/composite-actions/install-and-run-dotnet/action.yml index bdd3eb366a7..f108153f9de 100644 --- a/.github/composite-actions/install-and-run-dotnet/action.yml +++ b/.github/composite-actions/install-and-run-dotnet/action.yml @@ -39,6 +39,6 @@ runs: babel_databaseName=master \ babel_user=jdbc_user \ babel_password=12345678 \ - testName="all---TestUDD.txt;TestChar.txt;TestSqlVariant.txt;TestVarChar.txt;TestAuthentication.txt;TestText.txt" \ + testName="all---TestUDD.txt;TestChar.txt;TestSqlVariant.txt;TestVarChar.txt;TestAuthentication.txt;TestText.txt;TestPoint.txt" \ dotnet test shell: bash diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule index 795c031b1c9..a05630e3fd3 100644 --- a/test/JDBC/jdbc_schedule +++ b/test/JDBC/jdbc_schedule @@ -12,6 +12,11 @@ all # BABEL-SP_FKEYS test is very slow and causing github action timeout. +# Geospatial Datatypes are disabled +ignore#!#TestSpatialPoint-vu-prepare +ignore#!#TestSpatialPoint-vu-cleanup +ignore#!#TestSpatialPoint-vu-verify + # JDBC bulk insert API seems to call SET FMTONLY ON without calling SET FMTONLY OFF, causing some spurious test failures. ignore#!#insertbulk ignore#!#BABEL-SQLvariant diff --git a/test/odbc/mssqlodbc/test_data_types.cpp b/test/odbc/mssqlodbc/test_data_types.cpp index cce92a31c3e..7d9bcd6416f 100644 --- a/test/odbc/mssqlodbc/test_data_types.cpp +++ b/test/odbc/mssqlodbc/test_data_types.cpp @@ -455,7 +455,7 @@ TEST_F(MSSQL_Data_Types, Varchar) { // 2. the way the INSERTED_VALUES are inserted - loop through the 'literal' inserted values since they 'hard code' the 'order of insertions' values // The reason it was done this way is because in SQL Server you have to call function to convert wkt to geometry type so it contains additional '()' which causes error while processing parameters // For example, if I had to insert Point(1.0 2.0) it will be done using geometry::STGeomFromText('Point(1.0 2.0)', 4326), which causes error in processInsertedValuesString. -TEST_F(MSSQL_Data_Types, Geometry) { +TEST_F(MSSQL_Data_Types, DISABLED_Geometry) { OdbcHandler odbcHandler(Drivers::GetDriver(ServerType::MSSQL)); const string TEST_TABLE = "POINTGEOM_dt"; @@ -500,7 +500,7 @@ TEST_F(MSSQL_Data_Types, Geometry) { // 2. the way the INSERTED_VALUES are inserted - loop through the 'literal' inserted values since they 'hard code' the 'order of insertions' values // The reason it was done this way is because in SQL Server you have to call function to convert wkt to geography type so it contains additional '()' which causes error while processing parameters // For example, if I had to insert Point(1.0 2.0) it will be done using geography::STGeomFromText('Point(1.0 2.0)', 4326), which causes error in processInsertedValuesString. -TEST_F(MSSQL_Data_Types, Geography) { +TEST_F(MSSQL_Data_Types, DISABLED_Geography) { OdbcHandler odbcHandler(Drivers::GetDriver(ServerType::MSSQL)); const string TEST_TABLE = "POINTGEOG_dt"; diff --git a/test/odbc/psqlodbc/test/geography.cpp b/test/odbc/psqlodbc/test/geography.cpp index 79a952454b4..057127594a5 100644 --- a/test/odbc/psqlodbc/test/geography.cpp +++ b/test/odbc/psqlodbc/test/geography.cpp @@ -33,7 +33,7 @@ class PSQL_DataTypes_Geography : public testing::Test { } }; -TEST_F(PSQL_DataTypes_Geography, Table_Creation) { +TEST_F(PSQL_DataTypes_Geography, DISABLED_Table_Creation) { const vector LENGTH_EXPECTED = {10, 0}; const vector PRECISION_EXPECTED = {10, 0}; const vector SCALE_EXPECTED = {0, 0}; @@ -45,7 +45,7 @@ TEST_F(PSQL_DataTypes_Geography, Table_Creation) { dropObject(ServerType::MSSQL, "TABLE", TABLE_NAME); } -TEST_F(PSQL_DataTypes_Geography, Insertion_Success) { +TEST_F(PSQL_DataTypes_Geography, DISABLED_Insertion_Success) { const vector INSERTED_VALUES = { "(geography::STGeomFromText('Point(47.65100 -22.34900)', 4326))", "(geography::STGeomFromText('Point(1.0 2.0)', 4326))", @@ -68,7 +68,7 @@ TEST_F(PSQL_DataTypes_Geography, Insertion_Success) { dropObject(ServerType::MSSQL, "TABLE", TABLE_NAME); } -TEST_F(PSQL_DataTypes_Geography, Update_Success) { +TEST_F(PSQL_DataTypes_Geography, DISABLED_Update_Success) { const vector INSERTED_VALUES = { "(geography::STGeomFromText('Point(47.65100 -22.34900)', 4326))" }; @@ -97,7 +97,7 @@ TEST_F(PSQL_DataTypes_Geography, Update_Success) { dropObject(ServerType::MSSQL, "TABLE", TABLE_NAME); } -TEST_F(PSQL_DataTypes_Geography, View_creation) { +TEST_F(PSQL_DataTypes_Geography, DISABLED_View_creation) { const vector INSERTED_VALUES = { "(geography::STGeomFromText('Point(47.65100 -22.34900)', 4326))", "(geography::STGeomFromText('Point(1.0 2.0)', 4326))", diff --git a/test/odbc/psqlodbc/test/geometry.cpp b/test/odbc/psqlodbc/test/geometry.cpp index 0f7bf73ae04..99305968072 100644 --- a/test/odbc/psqlodbc/test/geometry.cpp +++ b/test/odbc/psqlodbc/test/geometry.cpp @@ -33,7 +33,7 @@ class PSQL_DataTypes_Geometry : public testing::Test { } }; -TEST_F(PSQL_DataTypes_Geometry, Table_Creation) { +TEST_F(PSQL_DataTypes_Geometry, DISABLED_Table_Creation) { const vector LENGTH_EXPECTED = {10, 0}; const vector PRECISION_EXPECTED = {10, 0}; const vector SCALE_EXPECTED = {0, 0}; @@ -45,7 +45,7 @@ TEST_F(PSQL_DataTypes_Geometry, Table_Creation) { dropObject(ServerType::MSSQL, "TABLE", TABLE_NAME); } -TEST_F(PSQL_DataTypes_Geometry, Insertion_Success) { +TEST_F(PSQL_DataTypes_Geometry, DISABLED_Insertion_Success) { const vector INSERTED_VALUES = { "(geometry::STGeomFromText('Point(47.65100 -22.34900)', 4326))", "(geometry::STGeomFromText('Point(1.0 2.0)', 4326))", @@ -68,7 +68,7 @@ TEST_F(PSQL_DataTypes_Geometry, Insertion_Success) { dropObject(ServerType::MSSQL, "TABLE", TABLE_NAME); } -TEST_F(PSQL_DataTypes_Geometry, Update_Success) { +TEST_F(PSQL_DataTypes_Geometry, DISABLED_Update_Success) { const vector INSERTED_VALUES = { "(geometry::STGeomFromText('Point(47.65100 -22.34900)', 4326))" }; @@ -97,7 +97,7 @@ TEST_F(PSQL_DataTypes_Geometry, Update_Success) { dropObject(ServerType::MSSQL, "TABLE", TABLE_NAME); } -TEST_F(PSQL_DataTypes_Geometry, View_creation) { +TEST_F(PSQL_DataTypes_Geometry, DISABLED_View_creation) { const vector INSERTED_VALUES = { "(geometry::STGeomFromText('Point(47.65100 -22.34900)', 4326))", "(geometry::STGeomFromText('Point(1.0 2.0)', 4326))", diff --git a/test/python/expected/upgrade_validation/expected_dependency.out b/test/python/expected/upgrade_validation/expected_dependency.out index 02ce56cee8a..11231c8d641 100644 --- a/test/python/expected/upgrade_validation/expected_dependency.out +++ b/test/python/expected/upgrade_validation/expected_dependency.out @@ -515,9 +515,11 @@ Function sys.isjson(text) Function sys.isnumeric(anyelement) Function sys.isnumeric(text) Function sys.language() +Function sys.lat(sys.geography) Function sys.len(sys.bbf_varbinary) Function sys.len(text) Function sys.lock_timeout() +Function sys.long(sys.geography) Function sys.max_connections() Function sys.max_precision() Function sys.microsoftversion() @@ -651,10 +653,17 @@ Function sys.sqlvariant_varchar(sys.sql_variant) Function sys.square(double precision) Function sys.st_geometrytype(sys.geography) Function sys.st_geometrytype(sys.geometry) +Function sys.st_transform(sys.geography,integer) Function sys.st_zmflag(sys.geography) Function sys.st_zmflag(sys.geometry) +Function sys.stasbinary(sys.geography) +Function sys.stasbinary(sys.geometry) Function sys.stasbinary_helper(sys.geography) +Function sys.stastext(sys.geography) +Function sys.stastext(sys.geometry) Function sys.stastext_helper(sys.geography) +Function sys.stdistance(sys.geography,sys.geography) +Function sys.stdistance(sys.geometry,sys.geometry) Function sys.stdistance_helper(sys.geography,sys.geography) Function sys.stgeogfromtext_helper(text,integer) Function sys.stgeomfromtext_helper(text,integer) @@ -662,6 +671,8 @@ Function sys.string_escape(sys.nvarchar,text) Function sys.string_split(character varying,character varying) Function sys.stuff(anyelement,integer,integer,anyelement) Function sys.stuff(text,integer,integer,text) +Function sys.stx(sys.geometry) +Function sys.sty(sys.geometry) Function sys.suser_id() Function sys.suser_id_internal(text) Function sys.suser_name() @@ -911,6 +922,8 @@ Operator sys.<>(sys.fixeddecimal,integer) Operator sys.<>(sys.fixeddecimal,numeric) Operator sys.<>(sys.fixeddecimal,smallint) Operator sys.<>(sys.fixeddecimal,sys.fixeddecimal) +Operator sys.<>(sys.geography,sys.geography) +Operator sys.<>(sys.geometry,sys.geometry) Operator sys.<>(sys.rowversion,sys.rowversion) Operator sys.<>(sys.smalldatetime,date) Operator sys.<>(sys.smalldatetime,sys.smalldatetime) @@ -931,6 +944,8 @@ Operator sys.=(sys.fixeddecimal,bigint) Operator sys.=(sys.fixeddecimal,integer) Operator sys.=(sys.fixeddecimal,numeric) Operator sys.=(sys.fixeddecimal,smallint) +Operator sys.=(sys.geography,sys.geography) +Operator sys.=(sys.geometry,sys.geometry) Operator sys.=(sys.rowversion,sys.rowversion) Operator sys.=(sys.smalldatetime,date) Operator sys.=(sys.smalldatetime,sys.smalldatetime) @@ -989,6 +1004,8 @@ Type sys."bigint" Type sys."real" Type sys.bbf_varbinary Type sys.cursor +Type sys.geography +Type sys.geometry View information_schema_tsql.check_constraints View information_schema_tsql.column_domain_usage View information_schema_tsql.constraint_column_usage