Skip to content

#64 - Improve error handling when no utPLSQL is installed #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 13, 2019
Merged

#64 - Improve error handling when no utPLSQL is installed #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc76849
change to snapshot version 1.1.0-SNAPSHOT
PhilippSalvisberg Jul 13, 2019
4b2e3ac
getUtPlsqlVersion does not fail when utplsql is not installed
PhilippSalvisberg Jul 13, 2019
66be251
testing if normalizedUtPlsqlVersion returns a not null value
PhilippSalvisberg Jul 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sqldev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- The Basics -->
<groupId>org.utplsql</groupId>
<artifactId>org.utplsql.sqldev</artifactId>
<version>1.0.0</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
36 changes: 22 additions & 14 deletions sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import org.utplsql.sqldev.model.ut.OutputLines

class UtplsqlDao {
public static val UTPLSQL_PACKAGE_NAME = "UT"
public static val NOT_INSTALLED = 0000000
public static val FIRST_VERSION_WITH_INTERNAL_ANNOTATION_API = 3000004
public static val FIRST_VERSION_WITH_ANNOTATION_API = 3001003
public static val FIRST_VERSION_WITHOUT_INTERNAL_API = 3001008
Expand Down Expand Up @@ -60,14 +61,15 @@ class UtplsqlDao {
* returns a normalized utPLSQL version in format 9.9.9
*/
def String normalizedUtPlsqlVersion() {
val p = Pattern.compile("(\\d+\\.\\d+\\.\\d+)")
val version = getUtPlsqlVersion()
val m = p.matcher(version)
if (m.find) {
return m.group(0)
} else {
return "0.0.0"
if (version !== null) {
val p = Pattern.compile("(\\d+\\.\\d+\\.\\d+)")
val m = p.matcher(version)
if (m.find) {
return m.group(0)
}
}
return "0.0.0"
}

/**
Expand Down Expand Up @@ -97,14 +99,20 @@ class UtplsqlDao {
? := ut.version;
END;
'''
cachedUtPlsqlVersion = jdbcTemplate.execute(sql, new CallableStatementCallback<String>() {
override String doInCallableStatement(CallableStatement cs) throws SQLException, DataAccessException {
cs.registerOutParameter(1, Types.VARCHAR);
cs.execute
val version = cs.getString(1)
return version
}
})
try {
cachedUtPlsqlVersion = jdbcTemplate.execute(sql, new CallableStatementCallback<String>() {
override String doInCallableStatement(CallableStatement cs) throws SQLException, DataAccessException {
cs.registerOutParameter(1, Types.VARCHAR);
cs.execute
val version = cs.getString(1)
return version
}
})
} catch (SQLException e) {
// ignore error
} catch (DataAccessException e) {
// ignore error
}
}
return cachedUtPlsqlVersion
}
Expand Down
7 changes: 7 additions & 0 deletions sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,5 +588,12 @@ class DalTest extends AbstractJdbcTest {
Assert.assertEquals("PACKAGE", actual)
jdbcTemplate.execute("DROP PACKAGE junit_utplsql_test_pkg")
}

@Test
def void normalizedUtPlsqlVersion() {
val dao = new UtplsqlDao(dataSource.connection)
val version = dao.normalizedUtPlsqlVersion
Assert.assertTrue(version !== null)
}

}