Skip to content

Commit a870035

Browse files
committed
Allow parallel access to Oracle database
1 parent ab7f26d commit a870035

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

test/NetTopologySuite.IO.Oracle.Test/IntegrationTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ namespace NetTopologySuite.IO.Oracle.Connection.Test
1414
[TestFixture]
1515
public class IntegrationTest
1616
{
17-
private const string testTableName = "NTS_TEST_GEO_DATA";
1817
private string _connectionString;
1918

2019
[OneTimeSetUp]
@@ -75,20 +74,21 @@ public void TestWritingAndReadingBackFromGeometryTable(string wkt)
7574
using var connection = OracleHelper.OpenConnection(_connectionString);
7675

7776
// Make a new table.v
78-
string res = OracleHelper.CreateGeometryTable(connection, testTableName);
77+
string tableName = $"tbl_{Guid.NewGuid()}".Replace('-', '_');
78+
string res = OracleHelper.CreateGeometryTable(connection, tableName);
7979
// TODO this is pretty dumb, need to check exact output
8080
Assert.That(!string.IsNullOrWhiteSpace(res));
8181

8282
// Write current geometry to table.
83-
var geom = OracleHelper.WriteGeometryToTable(connection, wkt, testTableName);
83+
var geom = OracleHelper.WriteGeometryToTable(connection, wkt, tableName);
8484

8585
// Read current geometry from table.
86-
var geom2 = OracleHelper.ReadGeometryFromTable(connection, testTableName);
86+
var geom2 = OracleHelper.ReadGeometryFromTable(connection, tableName);
8787

8888
Assert.That(geom.EqualsExact(geom2));
8989

9090
// Drop Geometry table
91-
OracleHelper.DropGeometryTable(connection, testTableName);
91+
OracleHelper.DropGeometryTable(connection, tableName);
9292
}
9393
}
9494
}

test/NetTopologySuite.IO.Oracle.Test/OracleHelper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static string CreateGeometryTable(OracleConnection connection, string tab
4848
{
4949
DropGeometryTable(connection, tableName);
5050

51-
string queryString = $"CREATE TABLE {tableName} (data MSYS.SDO_GEOMETRY)";
51+
string queryString = $"CREATE TABLE \"{tableName}\" (data MSYS.SDO_GEOMETRY)";
5252
using var command = new OracleCommand(queryString, connection);
5353
command.ExecuteNonQuery();
5454

@@ -66,7 +66,7 @@ public static void DropGeometryTable(OracleConnection connection, string tableNa
6666
{
6767
// Remove 'GEO_DATA' table
6868
string queryString = $@"BEGIN
69-
EXECUTE IMMEDIATE 'DROP TABLE {tableName}';
69+
EXECUTE IMMEDIATE 'DROP TABLE ""{tableName}""';
7070
EXCEPTION
7171
WHEN OTHERS THEN
7272
IF SQLCODE != -942 THEN
@@ -94,7 +94,7 @@ public static Geometries.Geometry WriteGeometryToTable(OracleConnection connecti
9494
// Drop & Create Geometry table.
9595
CreateGeometryTable(connection, testTableName);
9696

97-
string queryString = $"INSERT INTO {testTableName} (data) VALUES (:geo)";
97+
string queryString = $"INSERT INTO \"{testTableName}\" (data) VALUES (:geo)";
9898

9999
using var command = new OracleCommand(queryString, connection);
100100
var geometryParam = new OracleParameter()
@@ -142,7 +142,7 @@ public static Geometries.Geometry ReadGeometryFromTable(OracleConnection connect
142142
if (wasClosed) connection.Open();
143143

144144
// Write query string & command
145-
string queryString = $"SELECT * FROM {testTableName}";
145+
string queryString = $"SELECT * FROM \"{testTableName}\"";
146146
using var command = new OracleCommand(queryString, connection);
147147

148148
var geometryParam = new OracleParameter();

0 commit comments

Comments
 (0)