Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit86445e6

Browse files
Merge pull request#77 from PhilippSalvisberg/feature/76_optmize_check_menu_option
#76 - Optmize check "Run utPLSQL test" menu option
2 parentsb1db361 +dc8b8ef commit86445e6

File tree

2 files changed

+21
-26
lines changed

2 files changed

+21
-26
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class UtplsqlDao {
3737
publicstaticvalFIRST_VERSION_WITH_INTERNAL_ANNOTATION_API=3000004
3838
publicstaticvalFIRST_VERSION_WITH_ANNOTATION_API=3001003
3939
publicstaticvalFIRST_VERSION_WITHOUT_INTERNAL_API=3001008
40-
publicstaticvalNOT_YET_AVAILABLE=9009009
40+
publicstaticvalFIRST_VERSION_WITH_HAS_SUITES_API=3001008
4141
varConnection conn
4242
varJdbcTemplate jdbcTemplate
4343
// cache fields
@@ -183,9 +183,8 @@ class UtplsqlDao {
183183
*/
184184
defbooleancontainsUtplsqlTest(Stringowner,StringobjectName,StringsubobjectName) {
185185
try {
186-
if (normalizedUtPlsqlVersionNumber>=NOT_YET_AVAILABLE&& objectName!==null&& subobjectName!==null) {
187-
// use faster check function available since v3.1.3 (FIRST_VERSION_WITH_ANNOTATION_API)
188-
// disabled (NOT_YET_AVAILABLE) due to wrong results in v3.1.7
186+
if (normalizedUtPlsqlVersionNumber>=org.utplsql.sqldev.dal.UtplsqlDao.FIRST_VERSION_WITH_HAS_SUITES_API&& objectName!==null&& subobjectName!==null) {
187+
// use faster check function available since v3.1.3 (reliable in v3.1.8)
189188
val sql='''
190189
DECLARE
191190
l_return VARCHAR2(1) :='0';
@@ -253,9 +252,8 @@ class UtplsqlDao {
253252
}
254253

255254
defbooleancontainsUtplsqlTest(Stringowner) {
256-
if (normalizedUtPlsqlVersionNumber>=NOT_YET_AVAILABLE) {
257-
// use faster check function available since v3.1.3 (FIRST_VERSION_WITH_ANNOTATION_API)
258-
// disabled (NOT_YET_AVAILABLE) due to wrong results in v3.1.7
255+
if (normalizedUtPlsqlVersionNumber>=org.utplsql.sqldev.dal.UtplsqlDao.FIRST_VERSION_WITH_HAS_SUITES_API) {
256+
// use faster check function available since v3.1.3 (reliable in v3.1.8)
259257
val sql='''
260258
DECLARE
261259
l_return VARCHAR2(1) :='0';
@@ -282,9 +280,8 @@ class UtplsqlDao {
282280
}
283281

284282
defbooleancontainsUtplsqlTest(Stringowner,StringobjectName) {
285-
if (normalizedUtPlsqlVersionNumber>=NOT_YET_AVAILABLE) {
286-
// use faster check function available since v3.1.3 (FIRST_VERSION_WITH_ANNOTATION_API)
287-
// disabled (NOT_YET_AVAILABLE) due to wrong results in v3.1.7
283+
if (normalizedUtPlsqlVersionNumber>=org.utplsql.sqldev.dal.UtplsqlDao.FIRST_VERSION_WITH_HAS_SUITES_API) {
284+
// use faster check function available since v3.1.3 (reliable in v3.1.8)
288285
val sql='''
289286
DECLARE
290287
l_return VARCHAR2(1) :='0';

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import org.springframework.jdbc.BadSqlGrammarException
2525
importorg.utplsql.sqldev.dal.UtplsqlDao
2626
importorg.utplsql.sqldev.model.ut.Annotation
2727
importorg.utplsql.sqldev.test.AbstractJdbcTest
28-
importorg.junit.Ignore
2928

3029
classDalTestextendsAbstractJdbcTest {
3130

@@ -147,9 +146,8 @@ class DalTest extends AbstractJdbcTest {
147146
}
148147

149148
@Test
150-
@Ignore
151-
defvoidcontainsUtplsqlTest999() {
152-
containsUtplsqlTest("9.9.9")
149+
defvoidcontainsUtplsqlTest318() {
150+
containsUtplsqlTest("3.1.8")
153151
}
154152

155153
defvoidannotations(StringutPlsqlVersion) {
@@ -206,8 +204,8 @@ class DalTest extends AbstractJdbcTest {
206204
}
207205

208206
@Test
209-
defvoidannotations999() {
210-
annotations("9.9.9")
207+
defvoidannotations318() {
208+
annotations("3.1.8")
211209
}
212210

213211
defvoidtestablesPackages(StringutPlsqlVersion) {
@@ -252,8 +250,8 @@ class DalTest extends AbstractJdbcTest {
252250
}
253251

254252
@Test
255-
defvoidtestablesPackages999() {
256-
testablesPackages("9.9.9")
253+
defvoidtestablesPackages318() {
254+
testablesPackages("3.1.8")
257255
}
258256

259257
defvoidtestablesTypes(StringutPlsqlVersion) {
@@ -291,8 +289,8 @@ class DalTest extends AbstractJdbcTest {
291289
}
292290

293291
@Test
294-
defvoidtestablesTypes999() {
295-
testablesTypes("9.9.9")
292+
defvoidtestablesTypes318() {
293+
testablesTypes("3.1.8")
296294
}
297295

298296
defvoidtestablesFunctions(StringutPlsqlVersion) {
@@ -323,8 +321,8 @@ class DalTest extends AbstractJdbcTest {
323321
}
324322

325323
@Test
326-
defvoidtestablesFunctions999() {
327-
testablesFunctions("9.9.9")
324+
defvoidtestablesFunctions318() {
325+
testablesFunctions("3.1.8")
328326
}
329327

330328
defvoidtestablesProcedures(StringutPlsqlVersion) {
@@ -355,8 +353,8 @@ class DalTest extends AbstractJdbcTest {
355353
}
356354

357355
@Test
358-
defvoidtestablesProcedures999() {
359-
testablesProcedures("9.9.9")
356+
defvoidtestablesProcedures318() {
357+
testablesProcedures("3.1.8")
360358
}
361359

362360
defvoidrunnables(StringutPlsqlVersion) {
@@ -422,8 +420,8 @@ class DalTest extends AbstractJdbcTest {
422420
}
423421

424422
@Test
425-
defvoidrunnables999() {
426-
runnables("9.9.9")
423+
defvoidrunnables318() {
424+
runnables("3.1.8")
427425
}
428426

429427
@Test

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp