- Added support for Oracle in the sql Class

pborissow · pborissow · commit 742552f0d9ff · 2023-02-04T15:01:24.000Z
- Fixed Java compiler issues

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1478 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/sql/Connection.java b/src/javaxt/sql/Connection.java
@@ -204,7 +204,7 @@ public Generator<Recordset> getRecordset(String sql, boolean readOnly) throws SQ
             public void run() {
                 while (rs.hasNext()){
                     try{
-                        yield(rs);
+                        this.yield(rs);
                     }
                     catch(InterruptedException e){
                         return;
diff --git a/src/javaxt/sql/Database.java b/src/javaxt/sql/Database.java
@@ -362,6 +362,9 @@ protected String getURL(){
                 if (vendor.equals("SQLServer")){
                     database = ";databaseName=" + name;
                 }
+                else if (vendor.equals("Oracle")){
+                    database = ":" + name; //only tested with thin driver
+                }
                 else if (vendor.equals("Derby")){
                     database = ";databaseName=" + name;
                 }
@@ -387,14 +390,17 @@ else if (vendor.equals("Derby")){
                 path = driver.getProtocol() + "Tds:";
             }
         }
+        else if (vendor.equals("Oracle")){
+            path = driver.getProtocol() + ":thin:@"; //only tested with thin driver
+        }
         else if (vendor.equals("Derby") || vendor.equals("SQLite")){
             path = driver.getProtocol();
         }
 
 
 
       //Set properties
-        StringBuffer props = new StringBuffer();
+        StringBuilder props = new StringBuilder();
         if (properties!=null){
             java.util.Iterator it = properties.keySet().iterator();
             while (it.hasNext()){
diff --git a/src/javaxt/sql/Driver.java b/src/javaxt/sql/Driver.java
@@ -10,19 +10,20 @@
  ******************************************************************************/
 
 public class Driver {
-    
+
     private String vendor;
     private String driver;
     private String protocol;
     private java.sql.Driver Driver = null;
-    
-    
+
+
     /** Static list of drivers and corresponding metadata */
     private static Driver[] drivers = new Driver[]{
         new Driver("SQLServer","com.microsoft.sqlserver.jdbc.SQLServerDriver","jdbc:sqlserver"),
         new Driver("DB2","com.ibm.db2.jcc.DB2Driver","jdbc:db2"), //"COM.ibm.db2.jdbc.net.DB2Driver"
         new Driver("Sybase","com.sybase.jdbc3.jdbc.SybDriver","jdbc:sybase"),
         new Driver("PostgreSQL","org.postgresql.Driver","jdbc:postgresql"),
+        new Driver("Oracle", "oracle.jdbc.driver.OracleDriver", "jdbc:oracle"),
         new Driver("Derby","org.apache.derby.jdbc.EmbeddedDriver","jdbc:derby"),
         new Driver("SQLite","org.sqlite.JDBC","jdbc:sqlite"),
         new Driver("Microsoft Access","sun.jdbc.odbc.JdbcOdbcDriver","jdbc:odbc:Driver={Microsoft Access Driver (*.mdb)}"),
@@ -41,7 +42,6 @@ public class Driver {
         new Driver("Daffodil", "in.co.daffodil.db.jdbc.DaffodilDBDriver", "jdbc:daffodil"),
         new Driver("daffodilDB", "in.co.daffodil.db.rmi.RmiDaffodilDBDriver", "jdbc:daffodilDB"),
         new Driver("JTDS", "net.sourceforge.jtds.jdbc.Driver", "jdbc:jtds"), //Open source JDBC 3.0 type 4 driver for Microsoft SQL Server and Sybase ASE
-        new Driver("Oracle", "oracle.jdbc.driver.OracleDriver", "jdbc:oracle"),
         new Driver("derby net", "org.apache.derby.jdbc.ClientDriver", "jdbc:derby:net"),
         //new Driver("derby //", "org.apache.derby.jdbc.ClientDriver", "jdbc:derby://"),
         new Driver("Firebird", "org.firebirdsql.jdbc.FBDriver", "jdbc:firebirdsql"),
@@ -206,7 +206,7 @@ public boolean equals(Object obj){
             if (driver.getClassName().equalsIgnoreCase(this.getClassName()) &&
                 driver.getProtocol().toLowerCase().startsWith(this.getProtocol()) &&
                 driver.getVendor().equalsIgnoreCase(this.getVendor())
-            ){ 
+            ){
                  return true;
             }
             else{
@@ -215,11 +215,11 @@ public boolean equals(Object obj){
         }
         else if(obj instanceof java.lang.String){
             String driverName = obj.toString();
-            
+
             //Fetch/update protocol to avoid NPE
             String protocol = this.getProtocol();
             if (protocol==null) protocol = "";
-            
+
             if (driverName.equalsIgnoreCase(this.getClassName()) ||
                 driverName.toLowerCase().startsWith(protocol.toLowerCase()) ||
                 driverName.equalsIgnoreCase(this.getVendor())
@@ -256,7 +256,7 @@ public static Driver findDriver(String driverName){
                 e.printStackTrace();
             }
         }
-        
+
         return null;
     }
 
diff --git a/src/javaxt/utils/Java.java b/src/javaxt/utils/Java.java
@@ -34,7 +34,10 @@ private static int getJavaVersion(){
         }
         catch (Throwable t){
             try{
-                version = getVersion(java.lang.Runtime.version().toString());
+                version = getVersion(
+                    java.lang.Runtime.class.getMethod("version").invoke(null).toString());
+                
+                //version = getVersion(java.lang.Runtime.version().toString());
             }
             catch (Throwable t2){
                 version = -1;

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public Generator<Recordset> getRecordset(String sql, boolean readOnly) throws SQ`
`204`	`204`	`public void run() {`
`205`	`205`	`while (rs.hasNext()){`
`206`	`206`	`try{`
`207`		`- yield(rs);`
	`207`	`+ this.yield(rs);`
`208`	`208`	`}`
`209`	`209`	`catch(InterruptedException e){`
`210`	`210`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,9 @@ protected String getURL(){`
`362`	`362`	`if (vendor.equals("SQLServer")){`
`363`	`363`	`database = ";databaseName=" + name;`
`364`	`364`	`}`
	`365`	`+ else if (vendor.equals("Oracle")){`
	`366`	`+ database = ":" + name; //only tested with thin driver`
	`367`	`+ }`
`365`	`368`	`else if (vendor.equals("Derby")){`
`366`	`369`	`database = ";databaseName=" + name;`
`367`	`370`	`}`
`@@ -387,14 +390,17 @@ else if (vendor.equals("Derby")){`
`387`	`390`	`path = driver.getProtocol() + "Tds:";`
`388`	`391`	`}`
`389`	`392`	`}`
	`393`	`+ else if (vendor.equals("Oracle")){`
	`394`	`+ path = driver.getProtocol() + ":thin:@"; //only tested with thin driver`
	`395`	`+ }`
`390`	`396`	`else if (vendor.equals("Derby") \|\| vendor.equals("SQLite")){`
`391`	`397`	`path = driver.getProtocol();`
`392`	`398`	`}`
`393`	`399`
`394`	`400`
`395`	`401`
`396`	`402`	`//Set properties`
`397`		`- StringBuffer props = new StringBuffer();`
	`403`	`+ StringBuilder props = new StringBuilder();`
`398`	`404`	`if (properties!=null){`
`399`	`405`	`java.util.Iterator it = properties.keySet().iterator();`
`400`	`406`	`while (it.hasNext()){`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,10 @@ private static int getJavaVersion(){`
`34`	`34`	`}`
`35`	`35`	`catch (Throwable t){`
`36`	`36`	`try{`
`37`		`- version = getVersion(java.lang.Runtime.version().toString());`
	`37`	`+ version = getVersion(`
	`38`	`+ java.lang.Runtime.class.getMethod("version").invoke(null).toString());`
	`39`	`+`
	`40`	`+ //version = getVersion(java.lang.Runtime.version().toString());`
`38`	`41`	`}`
`39`	`42`	`catch (Throwable t2){`
`40`	`43`	`version = -1;`