Skip to content

Commit 373cc67

Browse files
author
Gopal Verma
committed
fixing_test_failures
1 parent aa41e21 commit 373cc67

File tree

4 files changed

+135
-18
lines changed

4 files changed

+135
-18
lines changed

‎test/JDBC/expected/Test-pointZM-vu-verify.out‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,16 +1608,18 @@ GO
16081608
-- MULTIPOINT
16091609
SELECT geometry::STGeomFromText('MULTIPOINT((0 0), (1 1), (2 2))', 4326);
16101610
GO
1611-
~~ERROR (Code: 33557097)~~
1612-
1613-
~~ERROR (Message: MULTIPOINT is not supported)~~
1611+
~~START~~
1612+
geometry
1613+
E610000001040300000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000004000000000000000400300000001000000000101000000010200000004000000FFFFFFFF0000000004000000000000000001000000000100000001000000000200000001
1614+
~~END~~
16141615

16151616

16161617
SELECT geography::STGeomFromText('MULTIPOINT((0 0), (1 1), (2 2))', 4326);
16171618
GO
1618-
~~ERROR (Code: 33557097)~~
1619-
1620-
~~ERROR (Message: MULTIPOINT is not supported)~~
1619+
~~START~~
1620+
geography
1621+
E610000001040300000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000004000000000000000400300000001000000000101000000010200000004000000FFFFFFFF0000000004000000000000000001000000000100000001000000000200000001
1622+
~~END~~
16211623

16221624

16231625

‎test/dotnet/ExpectedOutput/TestMultipoint.out‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
#Q#CREATE TABLE MPGEOM_dt(location GEOMETRY);
2+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
3+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
4+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
5+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
6+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
7+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
8+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
9+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
10+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
11+
#Q#INSERT INTO MPGEOM_dt(location) values(@location)
12+
#Q#CREATE TABLE MPGEOG_dt(location GEOGRAPHY);
13+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
14+
#E#Error converting data type varbinary to geography.
15+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
16+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
17+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
18+
#E#Error converting data type varbinary to geography.
19+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
20+
#E#Error converting data type varbinary to geography.
21+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
22+
#E#Error converting data type varbinary to geography.
23+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
24+
#E#Error converting data type varbinary to geography.
25+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
26+
#Q#INSERT INTO MPGEOG_dt(location) values(@location)
27+
#Q#INSERT INTO MPGEOM_dt(location) values(geometry::STGeomFromText('MULTIPOINT((1 2), (3 4))', 4326))
28+
#Q#INSERT INTO MPGEOM_dt(location) values(geometry::STGeomFromText('MULTIPOINT((1 2 3), (4 5 6))', 4326))
29+
#Q#INSERT INTO MPGEOM_dt(location) values(geometry::STGeomFromText('MULTIPOINT((1 2 NULL 4), (5 6 NULL 8))', 4326))
30+
#Q#INSERT INTO MPGEOM_dt(location) values(geometry::STGeomFromText('MULTIPOINT((1 2 3 4), (5 6 7 8))', 4326))
31+
#Q#INSERT INTO MPGEOM_dt(location) values(geometry::STGeomFromText('MULTIPOINT((1), (3 4))', 4326))
32+
#E#Invalid geometry
33+
#Q#INSERT INTO MPGEOM_dt(location) values(geometry::STGeomFromText('MULTIPOINT EMPTY', 4326))
34+
#Q#INSERT INTO MPGEOG_dt(location) values(geography::STGeomFromText('MULTIPOINT((45 90), (50 100))', 4326))
35+
#E#Latitude values must be between -90 and 90 degrees
36+
#Q#INSERT INTO MPGEOG_dt(location) values(geography::STGeomFromText('MULTIPOINT((45 90 100), (50 100 200))', 4326))
37+
#E#Latitude values must be between -90 and 90 degrees
38+
#Q#INSERT INTO MPGEOG_dt(location) values(geography::STGeomFromText('MULTIPOINT((45 90 100 1), (50 100 200 2))', 4326))
39+
#E#Latitude values must be between -90 and 90 degrees
40+
#Q#INSERT INTO MPGEOG_dt(location) values(geography::STGeomFromText('MULTIPOINT((45 90 NULL 1), (50 100 NULL 2))', 4326))
41+
#E#Latitude values must be between -90 and 90 degrees
42+
#Q#INSERT INTO MPGEOG_dt(location) values(geography::STGeomFromText('MULTIPOINT((1), (3 4))', 4326))
43+
#E#Invalid geometry
44+
#Q#INSERT INTO MPGEOG_dt(location) values(geography::STGeomFromText('MULTIPOINT EMPTY', 4326))
45+
#Q#SELECT * FROM MPGEOM_dt;
46+
#D#master.sys.geometry
47+
MULTIPOINT ((1 2), (3 4))
48+
MULTIPOINT EMPTY
49+
MULTIPOINT ((1 2), (3 4), (5 6))
50+
MULTIPOINT ((1 2 3), (4 5 6))
51+
MULTIPOINT ((1 2 3), (4 5 6))
52+
MULTIPOINT ((1 2 3), (4 5 6))
53+
MULTIPOINT ((1 2 3), (4 5))
54+
MULTIPOINT ((1 2), (4 5 6))
55+
MULTIPOINT ((1 2), (4 5 6))
56+
MULTIPOINT ((-1 -2), (-3 -4))
57+
MULTIPOINT ((1 2), (3 4))
58+
MULTIPOINT ((1 2 3), (4 5 6))
59+
MULTIPOINT ((1 2 NULL 4), (5 6 NULL 8))
60+
MULTIPOINT ((1 2 3 4), (5 6 7 8))
61+
MULTIPOINT EMPTY
62+
#Q#SELECT * FROM MPGEOG_dt;
63+
#D#master.sys.geography
64+
MULTIPOINT EMPTY
65+
MULTIPOINT ((0 0), (45 90), (30 60))
66+
MULTIPOINT ((0 0), (0 0))
67+
MULTIPOINT ((90 0), (-90 0))
68+
MULTIPOINT EMPTY
69+
#Q#CREATE TABLE MP_EMP_dt(geom GEOMETRY, geog GEOGRAPHY);
70+
#Q#INSERT INTO MP_EMP_dt(geom) values(@geom)
71+
#Q#INSERT INTO MP_EMP_dt(geog) values(@geog)
72+
#Q#INSERT INTO MP_EMP_dt(geom) values(@geom)
73+
#Q#INSERT INTO MP_EMP_dt(geog) values(@geog)
74+
#Q#SELECT geom.STAsText(), geog.STAsText() FROM MP_EMP_dt;
75+
#D#nvarchar#!#nvarchar
76+
MULTIPOINT EMPTY#!#
77+
#!#MULTIPOINT EMPTY
78+
MULTIPOINT EMPTY#!#
79+
#!#MULTIPOINT EMPTY
80+
#Q#SELECT geom.STDimension(), geog.STDimension() FROM MP_EMP_dt;
81+
#D#int#!#int
82+
-1#!#
83+
#!#-1
84+
-1#!#
85+
#!#-1
86+
#Q#SELECT geom.STIsClosed(), geog.STIsClosed() FROM MP_EMP_dt;
87+
#D#bit#!#bit
88+
False#!#
89+
#!#False
90+
False#!#
91+
#!#False
92+
#Q#SELECT geom.STIsValid(), geog.STIsValid() FROM MP_EMP_dt;
93+
#D#bit#!#bit
94+
True#!#
95+
#!#True
96+
True#!#
97+
#!#True
98+
#Q#SELECT geom.STAsBinary(), geog.STAsBinary() FROM MP_EMP_dt;
99+
#D#varbinary#!#varbinary
100+
140000000#!#
101+
102+
140000000
103+
140000000#!#
104+
105+
106+
140000000
107+
#Q#SELECT geom.STArea(), geog.STArea() FROM MP_EMP_dt;
108+
#D#float#!#float
109+
0#!#
110+
#!#0
111+
0#!#
112+
#!#0
113+
#Q#DROP TABLE IF EXISTS MPGEOM_dt;
114+
#Q#DROP TABLE IF EXISTS MPGEOG_dt;
115+
#Q#DROP TABLE IF EXISTS MP_EMP_dt;

‎test/odbc/psqlodbc/test/geography.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ TEST_F(PSQL_DataTypes_Geography, Insertion_Success) {
8080
"(geography::STGeomFromText('POLYGON((0 0 1, 10 0 2, 10 10 3, 0 10 4, 0 0 1), (2 2 5, 8 2 6, 8 8 7, 2 8 8, 2 2 5))', 4326))",
8181
"(geography::STGeomFromText('POLYGON((0 0 NULL 1, 10 0 2 NULL, 10 10 NULL 3, 0 10 4 NULL, 0 0 NULL 1), (2 2 5 NULL, 8 2 NULL 6, 8 8 7 NULL, 2 8 NULL 8, 2 2 5 NULL))', 4326))",
8282
"(geography::STGeomFromText('POLYGON((0 0 1 2, 10 0 3 4, 10 10 5 6, 0 10 7 8, 0 0 1 2), (2 2 9 10, 8 2 11 12, 8 8 13 14, 2 8 15 16, 2 2 9 10), (4 4 17 18, 6 4 19 20, 6 6 21 22, 4 6 23 24, 4 4 17 18))', 4326))",
83-
"(geography::STGeomFromText('POLYGON EMPTY', 4326))"
83+
"(geography::STGeomFromText('POLYGON EMPTY', 4326))",
8484
// test cases for MULTIPOINT
8585
"(geography::STGeomFromText('MULTIPOINT((1 2), (3 4))', 4326))",
8686
"(geography::STGeomFromText('MULTIPOINT((1 2), (3 4), (5 6))', 4326))",
@@ -129,7 +129,7 @@ TEST_F(PSQL_DataTypes_Geography, Insertion_Success) {
129129
"E610000001050A00000000000000000000000000000000000000000000000000000000000000000024400000000000002440000000000000244000000000000024400000000000000000000000000000000000000000000000000000000000000040000000000000004000000000000000400000000000002040000000000000204000000000000020400000000000002040000000000000004000000000000000400000000000000040000000000000F03F000000000000004000000000000008400000000000001040000000000000F03F000000000000144000000000000018400000000000001C4000000000000020400000000000001440020000000200000000000500000001000000FFFFFFFF0000000003",
130130
"E610000001070A00000000000000000000000000000000000000000000000000000000000000000024400000000000002440000000000000244000000000000024400000000000000000000000000000000000000000000000000000000000000040000000000000004000000000000000400000000000002040000000000000204000000000000020400000000000002040000000000000004000000000000000400000000000000040000000000000F8FF0000000000000040000000000000F8FF0000000000001040000000000000F8FF0000000000001440000000000000F8FF0000000000001C40000000000000F8FF0000000000001440000000000000F03F000000000000F8FF0000000000000840000000000000F8FF000000000000F03F000000000000F8FF0000000000001840000000000000F8FF0000000000002040000000000000F8FF020000000200000000000500000001000000FFFFFFFF0000000003",
131131
"E610000002030F000000000000000000000000000000000000000000000000000000000000000000244000000000000024400000000000002440000000000000244000000000000000000000000000000000000000000000000000000000000000400000000000000040000000000000004000000000000020400000000000002040000000000000204000000000000020400000000000000040000000000000004000000000000000400000000000001040000000000000104000000000000010400000000000001840000000000000184000000000000018400000000000001840000000000000104000000000000010400000000000001040000000000000F03F000000000000084000000000000014400000000000001C40000000000000F03F000000000000224000000000000026400000000000002A400000000000002E4000000000000022400000000000003140000000000000334000000000000035400000000000003740000000000000314000000000000000400000000000001040000000000000184000000000000020400000000000000040000000000000244000000000000028400000000000002C4000000000000030400000000000002440000000000000324000000000000034400000000000003640000000000000384000000000000032400300000002000000000005000000000A00000001000000FFFFFFFF0000000003",
132-
"E61000000104000000000000000001000000FFFFFFFFFFFFFFFF03"
132+
"E61000000104000000000000000001000000FFFFFFFFFFFFFFFF03",
133133

134134
// Expected values for MULTIPOINT test cases
135135
"", /* TODO: MULTIPOINT((1 2), (3 4)) */
@@ -194,7 +194,7 @@ TEST_F(PSQL_DataTypes_Geography, Update_Success) {
194194
"(geography::STGeomFromText('POLYGON((0 0 1, 10 0 2, 10 10 3, 0 10 4, 0 0 1), (2 2 5, 8 2 6, 8 8 7, 2 8 8, 2 2 5))', 4326))",
195195
"(geography::STGeomFromText('POLYGON((0 0 NULL 1, 10 0 2 NULL, 10 10 NULL 3, 0 10 4 NULL, 0 0 NULL 1), (2 2 5 NULL, 8 2 NULL 6, 8 8 7 NULL, 2 8 NULL 8, 2 2 5 NULL))', 4326))",
196196
"(geography::STGeomFromText('POLYGON((0 0 1 2, 10 0 3 4, 10 10 5 6, 0 10 7 8, 0 0 1 2), (2 2 9 10, 8 2 11 12, 8 8 13 14, 2 8 15 16, 2 2 9 10), (4 4 17 18, 6 4 19 20, 6 6 21 22, 4 6 23 24, 4 4 17 18))', 4326))",
197-
"(geography::STGeomFromText('POLYGON EMPTY', 4326))"
197+
"(geography::STGeomFromText('POLYGON EMPTY', 4326))",
198198
// test cases for MULTIPOINT
199199
"(geography::STGeomFromText('MULTIPOINT((1 2), (3 4))', 4326))",
200200
"(geography::STGeomFromText('MULTIPOINT((1 2), (3 4), (5 6))', 4326))",
@@ -242,7 +242,7 @@ TEST_F(PSQL_DataTypes_Geography, Update_Success) {
242242
"E610000001050A00000000000000000000000000000000000000000000000000000000000000000024400000000000002440000000000000244000000000000024400000000000000000000000000000000000000000000000000000000000000040000000000000004000000000000000400000000000002040000000000000204000000000000020400000000000002040000000000000004000000000000000400000000000000040000000000000F03F000000000000004000000000000008400000000000001040000000000000F03F000000000000144000000000000018400000000000001C4000000000000020400000000000001440020000000200000000000500000001000000FFFFFFFF0000000003",
243243
"E610000001070A00000000000000000000000000000000000000000000000000000000000000000024400000000000002440000000000000244000000000000024400000000000000000000000000000000000000000000000000000000000000040000000000000004000000000000000400000000000002040000000000000204000000000000020400000000000002040000000000000004000000000000000400000000000000040000000000000F8FF0000000000000040000000000000F8FF0000000000001040000000000000F8FF0000000000001440000000000000F8FF0000000000001C40000000000000F8FF0000000000001440000000000000F03F000000000000F8FF0000000000000840000000000000F8FF000000000000F03F000000000000F8FF0000000000001840000000000000F8FF0000000000002040000000000000F8FF020000000200000000000500000001000000FFFFFFFF0000000003",
244244
"E610000002030F000000000000000000000000000000000000000000000000000000000000000000244000000000000024400000000000002440000000000000244000000000000000000000000000000000000000000000000000000000000000400000000000000040000000000000004000000000000020400000000000002040000000000000204000000000000020400000000000000040000000000000004000000000000000400000000000001040000000000000104000000000000010400000000000001840000000000000184000000000000018400000000000001840000000000000104000000000000010400000000000001040000000000000F03F000000000000084000000000000014400000000000001C40000000000000F03F000000000000224000000000000026400000000000002A400000000000002E4000000000000022400000000000003140000000000000334000000000000035400000000000003740000000000000314000000000000000400000000000001040000000000000184000000000000020400000000000000040000000000000244000000000000028400000000000002C4000000000000030400000000000002440000000000000324000000000000034400000000000003640000000000000384000000000000032400300000002000000000005000000000A00000001000000FFFFFFFF0000000003",
245-
"E61000000104000000000000000001000000FFFFFFFFFFFFFFFF03"
245+
"E61000000104000000000000000001000000FFFFFFFFFFFFFFFF03",
246246
// Expected values for MULTIPOINT test cases
247247
"", /* TODO: MULTIPOINT((1 2), (3 4)) */
248248
"", /* TODO: MULTIPOINT((1 2), (3 4), (5 6)) */
@@ -301,7 +301,7 @@ TEST_F(PSQL_DataTypes_Geography, View_creation) {
301301
"(geography::STGeomFromText('POLYGON((0 0 1, 10 0 2, 10 10 3, 0 10 4, 0 0 1), (2 2 5, 8 2 6, 8 8 7, 2 8 8, 2 2 5))', 4326))",
302302
"(geography::STGeomFromText('POLYGON((0 0 NULL 1, 10 0 2 NULL, 10 10 NULL 3, 0 10 4 NULL, 0 0 NULL 1), (2 2 5 NULL, 8 2 NULL 6, 8 8 7 NULL, 2 8 NULL 8, 2 2 5 NULL))', 4326))",
303303
"(geography::STGeomFromText('POLYGON((0 0 1 2, 10 0 3 4, 10 10 5 6, 0 10 7 8, 0 0 1 2), (2 2 9 10, 8 2 11 12, 8 8 13 14, 2 8 15 16, 2 2 9 10), (4 4 17 18, 6 4 19 20, 6 6 21 22, 4 6 23 24, 4 4 17 18))', 4326))",
304-
"(geography::STGeomFromText('POLYGON EMPTY', 4326))"
304+
"(geography::STGeomFromText('POLYGON EMPTY', 4326))",
305305
// test cases for MULTIPOINT
306306
"(geography::STGeomFromText('MULTIPOINT((1 2), (3 4))', 4326))",
307307
"(geography::STGeomFromText('MULTIPOINT((1 2), (3 4), (5 6))', 4326))",
@@ -351,7 +351,7 @@ TEST_F(PSQL_DataTypes_Geography, View_creation) {
351351
"E610000001050A00000000000000000000000000000000000000000000000000000000000000000024400000000000002440000000000000244000000000000024400000000000000000000000000000000000000000000000000000000000000040000000000000004000000000000000400000000000002040000000000000204000000000000020400000000000002040000000000000004000000000000000400000000000000040000000000000F03F000000000000004000000000000008400000000000001040000000000000F03F000000000000144000000000000018400000000000001C4000000000000020400000000000001440020000000200000000000500000001000000FFFFFFFF0000000003",
352352
"E610000001070A00000000000000000000000000000000000000000000000000000000000000000024400000000000002440000000000000244000000000000024400000000000000000000000000000000000000000000000000000000000000040000000000000004000000000000000400000000000002040000000000000204000000000000020400000000000002040000000000000004000000000000000400000000000000040000000000000F8FF0000000000000040000000000000F8FF0000000000001040000000000000F8FF0000000000001440000000000000F8FF0000000000001C40000000000000F8FF0000000000001440000000000000F03F000000000000F8FF0000000000000840000000000000F8FF000000000000F03F000000000000F8FF0000000000001840000000000000F8FF0000000000002040000000000000F8FF020000000200000000000500000001000000FFFFFFFF0000000003",
353353
"E610000002030F000000000000000000000000000000000000000000000000000000000000000000244000000000000024400000000000002440000000000000244000000000000000000000000000000000000000000000000000000000000000400000000000000040000000000000004000000000000020400000000000002040000000000000204000000000000020400000000000000040000000000000004000000000000000400000000000001040000000000000104000000000000010400000000000001840000000000000184000000000000018400000000000001840000000000000104000000000000010400000000000001040000000000000F03F000000000000084000000000000014400000000000001C40000000000000F03F000000000000224000000000000026400000000000002A400000000000002E4000000000000022400000000000003140000000000000334000000000000035400000000000003740000000000000314000000000000000400000000000001040000000000000184000000000000020400000000000000040000000000000244000000000000028400000000000002C4000000000000030400000000000002440000000000000324000000000000034400000000000003640000000000000384000000000000032400300000002000000000005000000000A00000001000000FFFFFFFF0000000003",
354-
"E61000000104000000000000000001000000FFFFFFFFFFFFFFFF03"
354+
"E61000000104000000000000000001000000FFFFFFFFFFFFFFFF03",
355355
// Expected values for MULTIPOINT test cases
356356
"", /* TODO: MULTIPOINT((1 2), (3 4)) */
357357
"", /* TODO: MULTIPOINT((1 2), (3 4), (5 6)) */

0 commit comments

Comments
 (0)