Skip to content

Commit 66bf96a

Browse files
old, internal API is not accessible anymore with utPLSQL >= v3.1.8
1 parent a352e59 commit 66bf96a

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class UtplsqlDao {
3535
public static val UTPLSQL_PACKAGE_NAME = "UT"
3636
public static val FIRST_VERSION_WITH_INTERNAL_ANNOTATION_API = 3000004
3737
public static val FIRST_VERSION_WITH_ANNOTATION_API = 3001003
38+
public static val FIRST_VERSION_WITHOUT_INTERNAL_API = 3001008
3839
public static val NOT_YET_AVAILABLE = 9009009
3940
var Connection conn
4041
var JdbcTemplate jdbcTemplate

sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ class DalTest extends AbstractJdbcTest {
135135

136136
@Test
137137
def void containsUtplsqlTest304() {
138-
containsUtplsqlTest("3.0.4")
138+
val dao = new UtplsqlDao(dataSource.connection)
139+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
140+
containsUtplsqlTest("3.0.4")
141+
}
139142
}
140143

141144
@Test
@@ -191,7 +194,10 @@ class DalTest extends AbstractJdbcTest {
191194

192195
@Test
193196
def void annotations304() {
194-
annotations("3.0.4")
197+
val dao = new UtplsqlDao(dataSource.connection)
198+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
199+
annotations("3.0.4")
200+
}
195201
}
196202

197203
@Test
@@ -234,7 +240,10 @@ class DalTest extends AbstractJdbcTest {
234240

235241
@Test
236242
def void testablesPackages304() {
237-
testablesPackages("3.0.4")
243+
val dao = new UtplsqlDao(dataSource.connection)
244+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
245+
testablesPackages("3.0.4")
246+
}
238247
}
239248

240249
@Test
@@ -270,7 +279,10 @@ class DalTest extends AbstractJdbcTest {
270279

271280
@Test
272281
def void testablesTypes304() {
273-
testablesTypes("3.0.4")
282+
val dao = new UtplsqlDao(dataSource.connection)
283+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
284+
testablesTypes("3.0.4")
285+
}
274286
}
275287

276288
@Test
@@ -299,7 +311,10 @@ class DalTest extends AbstractJdbcTest {
299311

300312
@Test
301313
def void testablesFunctions304() {
302-
testablesFunctions("3.0.4")
314+
val dao = new UtplsqlDao(dataSource.connection)
315+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
316+
testablesFunctions("3.0.4")
317+
}
303318
}
304319

305320
@Test
@@ -328,7 +343,10 @@ class DalTest extends AbstractJdbcTest {
328343

329344
@Test
330345
def void testablesProcedures304() {
331-
testablesProcedures("3.0.4")
346+
val dao = new UtplsqlDao(dataSource.connection)
347+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
348+
testablesProcedures("3.0.4")
349+
}
332350
}
333351

334352
@Test
@@ -392,7 +410,10 @@ class DalTest extends AbstractJdbcTest {
392410

393411
@Test
394412
def void runnables304() {
395-
runnables("3.0.4")
413+
val dao = new UtplsqlDao(dataSource.connection)
414+
if (dao.normalizedUtPlsqlVersionNumber < UtplsqlDao.FIRST_VERSION_WITHOUT_INTERNAL_API) {
415+
runnables("3.0.4")
416+
}
396417
}
397418

398419
@Test

0 commit comments

Comments
 (0)