jdk annotations for some java.sql methods, related cleanup in stdlib & tests

2012-09-27 12:00:57 +02:00
parent c8e711f84b
commit 57c27bdd37
8 changed files with 147 additions and 20 deletions
@@ -0,0 +1,33 @@
+import java.sql.DriverManager
+
+fun getConnection(url: String?) {
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url)
+  DriverManager.getConnection(url!!) : java.sql.Connection
+}
+
+fun getConnection(url: String?, props: java.util.Properties?) {
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url, props)
+  DriverManager.getConnection(url!!, props) : java.sql.Connection
+}
+
+fun getConnection(url: String?, user: String?, password: String?) {
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url, user!!, password!!)
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url!!, user, password!!)
+  DriverManager.<!NONE_APPLICABLE!>getConnection<!>(url!!, user!!, password)
+  DriverManager.getConnection(url!!, user!!, password!!) : java.sql.Connection
+}
+
+fun getDriver(url: String?) {
+  DriverManager.getDriver(<!TYPE_MISMATCH!>url<!>)
+  DriverManager.getDriver(url!!) : java.sql.Driver
+}
+
+fun registerDriver(driver: java.sql.Driver?) {
+   DriverManager.registerDriver(<!TYPE_MISMATCH!>driver<!>)
+   DriverManager.registerDriver(driver!!)
+}
+
+fun getDrivers() {
+   // todo fix to java.util.Enumeration<java.sql.Driver> bug in compiler fixed
+   DriverManager.getDrivers() : java.util.Enumeration<*>
+}
@@ -0,0 +1,3 @@
+fun getMetaData(rs: java.sql.ResultSet) {
+  rs.getMetaData() : java.sql.ResultSetMetaData
+}
@@ -0,0 +1,13 @@
+fun executeQuery(statement: java.sql.Statement, cmd: String?) {
+  statement.executeQuery(<!TYPE_MISMATCH!>cmd<!>)
+  statement.executeQuery(cmd!!) : java.sql.ResultSet
+}
+
+fun executeQuery(statement: java.sql.PreparedStatement) {
+  statement.executeQuery() : java.sql.ResultSet
+}
+
+fun executeUpdate(statement: java.sql.Statement, cmd: String?) {
+  statement.<!NONE_APPLICABLE!>executeUpdate<!>(cmd)
+  statement.executeUpdate(cmd!!)
+}