Skip to content

Navigation Menu

Sign in

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
Appearance settings

Commit b6bc322

Browse filesBrowse files
PhilippSalvisbergPhilippSalvisberg
authored
Merge pull request #94 from utPLSQL/bugfix/issue_86_93
Bugfix/issue 86 93
2 parents 58a76c8 + ec0b73e commit b6bc322
Copy full SHA for b6bc322

File tree

5 files changed

+55
-48
lines changed
Filter options

5 files changed

+55
-48
lines changed

‎README.md

Copy file name to clipboardExpand all lines: README.md
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ Please file your bug reports, enhancement requests, questions and other support
131131

132132
## How to Build
133133

134-
1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 19.1.0
135-
2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.5.4
134+
1. [Download](http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html) and install SQL Developer 19.4.0
135+
2. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.6.3
136136
3. [Download](https://git-scm.com/downloads) and install a git command line client
137137
4. Clone the utPLSQL-SQLDeveloper repository
138138
5. Open a terminal window in the utPLSQL-SQLDeveloper root folder and type
@@ -141,7 +141,7 @@ Please file your bug reports, enhancement requests, questions and other support
141141

142142
6. Run maven build by the following command
143143

144-
mvn -Dsqldev.basedir=/Applications/SQLDeveloper19.1.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
144+
mvn -Dsqldev.basedir=/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper -DskipTests=true clean package
145145

146146
Amend the parameter sqldev.basedir to match the path of your SQL Developer installation. This folder is used to reference Oracle jar files which are not available in public Maven repositories
147147
7. The resulting file ```utplsql_for_SQLDev_x.x.x-SNAPSHOT.zip``` in the ```target``` directory can be installed within SQL Developer

‎sqldev/pom.xml

Copy file name to clipboardExpand all lines: sqldev/pom.xml
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<jdk.version>1.8</jdk.version>
1313
<jdk.version.test>1.8</jdk.version.test>
14-
<xtend.version>2.18.0</xtend.version>
14+
<xtend.version>2.20.0</xtend.version>
1515
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
16-
<sqldev.basedir>/Applications/SQLDeveloper19.1.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
16+
<sqldev.basedir>/Applications/SQLDeveloper19.4.0.app/Contents/Resources/sqldeveloper</sqldev.basedir>
1717
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
1818
</properties>
1919
<dependencies>
@@ -170,12 +170,12 @@
170170
<dependency>
171171
<groupId>org.springframework</groupId>
172172
<artifactId>spring-jdbc</artifactId>
173-
<version>5.1.8.RELEASE</version>
173+
<version>5.2.4.RELEASE</version>
174174
</dependency>
175175
<dependency>
176176
<groupId>org.springframework</groupId>
177177
<artifactId>spring-web</artifactId>
178-
<version>5.1.8.RELEASE</version>
178+
<version>5.2.4.RELEASE</version>
179179
</dependency>
180180
<dependency>
181181
<groupId>org.oddgen</groupId>
@@ -234,7 +234,7 @@
234234
</plugin>
235235
<plugin>
236236
<groupId>org.apache.maven.plugins</groupId>
237-
<version>3.8.0</version>
237+
<version>3.8.1</version>
238238
<artifactId>maven-compiler-plugin</artifactId>
239239
<configuration>
240240
<source>${jdk.version}</source>
@@ -337,7 +337,7 @@
337337
<plugin>
338338
<groupId>org.codehaus.mojo</groupId>
339339
<artifactId>build-helper-maven-plugin</artifactId>
340-
<version>3.0.0</version>
340+
<version>3.1.0</version>
341341
<executions>
342342
<execution>
343343
<id>parse-version</id>
@@ -400,7 +400,7 @@
400400
<plugin>
401401
<groupId>org.apache.felix</groupId>
402402
<artifactId>maven-bundle-plugin</artifactId>
403-
<version>4.2.0</version>
403+
<version>4.2.1</version>
404404
<extensions>true</extensions>
405405
<configuration>
406406
<finalName>${project.name}</finalName>
@@ -450,7 +450,7 @@
450450
</plugin>
451451
<plugin>
452452
<artifactId>maven-assembly-plugin</artifactId>
453-
<version>3.1.1</version><!--$NO-MVN-MAN-VER$-->
453+
<version>3.2.0</version><!--$NO-MVN-MAN-VER$-->
454454
<configuration>
455455
<finalName>${final.name}</finalName>
456456
<appendAssemblyId>false</appendAssemblyId>

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

Copy file name to clipboardExpand all lines: sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend
+39-36Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -859,44 +859,47 @@ class UtplsqlDao {
859859
* @throws DataAccessException if there is a problem
860860
*/
861861
def String htmlCodeCoverage(List<String> pathList, List<String> schemaList, List<String> includeObjectList, List<String> excludeObjectList) {
862-
enableDbmsOutput
863862
val sql = '''
864-
BEGIN
865-
ut.run(
866-
a_paths => ut_varchar2_list(
867-
«FOR path : pathList SEPARATOR ", "»
868-
'«path»'
869-
«ENDFOR»
870-
),
871-
«IF schemaList.size > 0»
872-
a_coverage_schemes => ut_varchar2_list(
873-
«FOR schema : schemaList SEPARATOR ", "»
874-
'«schema»'
875-
«ENDFOR»
876-
),
877-
«ENDIF»
878-
«IF includeObjectList.size > 0»
879-
a_include_objects => ut_varchar2_list(
880-
«FOR includeObject : includeObjectList SEPARATOR ", "»
881-
'«includeObject»'
882-
«ENDFOR»
883-
),
884-
«ENDIF»
885-
«IF excludeObjectList.size > 0»
886-
a_exclude_objects => ut_varchar2_list(
887-
«FOR excludeObject : excludeObjectList SEPARATOR ", "»
888-
'«excludeObject»'
889-
«ENDFOR»
890-
),
891-
«ENDIF»
892-
a_reporter => ut_coverage_html_reporter()
893-
);
894-
END;
863+
SELECT column_value
864+
FROM table(
865+
ut.run(
866+
a_paths => ut_varchar2_list(
867+
«FOR path : pathList SEPARATOR ", "»
868+
'«path»'
869+
«ENDFOR»
870+
),
871+
«IF schemaList.size > 0»
872+
a_coverage_schemes => ut_varchar2_list(
873+
«FOR schema : schemaList SEPARATOR ", "»
874+
'«schema»'
875+
«ENDFOR»
876+
),
877+
«ENDIF»
878+
«IF includeObjectList.size > 0»
879+
a_include_objects => ut_varchar2_list(
880+
«FOR includeObject : includeObjectList SEPARATOR ", "»
881+
'«includeObject»'
882+
«ENDFOR»
883+
),
884+
«ENDIF»
885+
«IF excludeObjectList.size > 0»
886+
a_exclude_objects => ut_varchar2_list(
887+
«FOR excludeObject : excludeObjectList SEPARATOR ", "»
888+
'«excludeObject»'
889+
«ENDFOR»
890+
),
891+
«ENDIF»
892+
a_reporter => ut_coverage_html_reporter()
893+
)
894+
)
895895
'''
896-
jdbcTemplate.update(sql)
897-
val ret = getDbmsOutput
898-
disableDbmsOutput
899-
return ret
896+
val lines = jdbcTemplate.queryForList(sql, String)
897+
val sb = new StringBuilder
898+
for (line : lines.filter[it !== null]) {
899+
sb.append(line)
900+
sb.append("\n")
901+
}
902+
return sb.toString
900903
}
901904

902905
/**

‎sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend

Copy file name to clipboardExpand all lines: sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,9 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
377377
showInfoIndicatorCheckBoxMenuItem.selected = preferences.showInfoIndicator
378378
applyShowInfoIndicator(showInfoIndicatorCheckBoxMenuItem.selected)
379379
showSuccessfulTestsCheckBoxMenuItem.selected = preferences.showSuccessfulTests
380+
fixCheckBoxMenuItem(showSuccessfulTestsCheckBoxMenuItem)
380381
showDisabledTestsCheckBoxMenuItem.selected = preferences.showDisabledTests
382+
fixCheckBoxMenuItem(showDisabledTestsCheckBoxMenuItem)
381383
applyFilter(showSuccessfulTestsCheckBoxMenuItem.selected, showDisabledTestsCheckBoxMenuItem.selected)
382384
fixCheckBoxMenuItem(showInfoIndicatorCheckBoxMenuItem)
383385
syncDetailTabCheckBoxMenuItem.selected = preferences.syncDetailTab

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

Copy file name to clipboardExpand all lines: sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,9 @@ class DalTest extends AbstractJdbcTest {
489489
val actualEmpty = dao.includes('SCOTT', 'TEST_F1')
490490
Assert.assertEquals(#[], actualEmpty)
491491
val actual = dao.includes('SCOTT', 'junit_utplsql_test_pkg')
492-
Assert.assertEquals(#['SCOTT.JUNIT_UTPLSQL_TEST_PKG','SCOTT.JUNIT_F','UT3_LATEST_RELEASE.UT_DATA_VALUE','UT3_LATEST_RELEASE.UT_EXPECTATION'].sort, actual.sort)
492+
Assert.assertTrue(actual.findFirst[it == "SCOTT.JUNIT_UTPLSQL_TEST_PKG"] !== null)
493+
Assert.assertTrue(actual.findFirst[it == "SCOTT.JUNIT_F"] !== null)
494+
Assert.assertTrue(actual.findFirst[it == "UT3_LATEST_RELEASE.UT_EXPECTATION"] !== null)
493495
}
494496

495497
@Test

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.