--- FM2SQL/Attic/DBBean.java 2004/03/12 11:48:57 1.10 +++ FM2SQL/Attic/DBBean.java 2004/05/06 11:39:42 1.18 @@ -1,7 +1,23 @@ +/* + * DBBean.java -- Class that ecapsulates all database actions + * Filemake to SQL Converter + * Copyright (C) 2004 Robert Gordesch (rogo@mpiwg-berlin.mpg.de) + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. Please read license.txt for the full details. A copy of + * the GPL may be found at http://www.gnu.org/copyleft/lgpl.html You should + * have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place, Suite 330, Boston, MA 02111-1307 USA Created on 15.09.2003 by + * rogo + */ import java.sql.*; +import java.text.DateFormat; import java.util.*; + import com.fmi.jdbc.*; /** @@ -136,8 +152,8 @@ public class DBBean ConnectionPool conPool = (ConnectionPool) connectionPool.get(url); if (conPool == null) { - connection = DriverManager.getConnection(url, user, passwd); - connectionPool.put(url, new ConnectionPool(url, user, passwd, connection)); + createConnection(); + } else { if (!conPool.user.equals(user) || !conPool.passwd.equals(passwd)) @@ -151,12 +167,15 @@ public class DBBean if (connection.isClosed()) { System.out.println("Made new connection!!!"); - connection = DriverManager.getConnection(conPool.url, conPool.user, conPool.passwd); + createConnection(); + + // connection = DriverManager.getConnection(conPool.url, conPool.user, conPool.passwd); conPool.con = connection; } } if (url != "" && connection == null) - connection = DriverManager.getConnection(url, user, passwd); + createConnection(); + //connection = DriverManager.getConnection(url, user, passwd); dbMetaData = connection.getMetaData(); quoteChar = dbMetaData.getIdentifierQuoteString(); if (quoteChar == null) @@ -164,6 +183,25 @@ public class DBBean return connection; } + private void createConnection() throws SQLException + { + // setup the properties + java.util.Properties prop = new java.util.Properties(); + prop.put("charSet", "Cp1256"); + prop.put("user", user); + prop.put("password", passwd); + System.out.println("url "+url); + if(url.indexOf("odbc")>=0) + { + // Connect to the database + connection = DriverManager.getConnection(url, prop); + System.out.println("odbc with properties inited"); + } + else + connection = DriverManager.getConnection(url, user, passwd); + connectionPool.put(url, new ConnectionPool(url, user, passwd, connection)); + + } /** * sets the connection of this DBBean to the database specified in the url * property @@ -172,7 +210,8 @@ public class DBBean { this.url = url; if (url != "") - connection = DriverManager.getConnection(url, user, passwd); + //connection = DriverManager.getConnection(url, user, passwd); + createConnection(); dbMetaData = connection.getMetaData(); quoteChar = dbMetaData.getIdentifierQuoteString(); if (quoteChar == null) @@ -188,7 +227,8 @@ public class DBBean this.passwd = passwd; this.url = url; if (url != "") - connection = DriverManager.getConnection(url, user, passwd); + createConnection(); + // connection = DriverManager.getConnection(url, user, passwd); dbMetaData = connection.getMetaData(); quoteChar = dbMetaData.getIdentifierQuoteString(); if (quoteChar == null) @@ -555,8 +595,8 @@ public class DBBean // container fields try { - tableRow.addElement(new Integer(resultSet.getInt(i))); - m_columnClasses.addElement(Integer.class); + tableRow.addElement(new Double(resultSet.getDouble(i))); + m_columnClasses.addElement(Double.class); } catch (Exception e) { @@ -574,7 +614,7 @@ public class DBBean if (number.length() > 0) { tableRow.addElement(null); - m_columnClasses.addElement(Integer.class); + m_columnClasses.addElement(Double.class); } else tableRow.addElement(null); } @@ -651,9 +691,28 @@ public class DBBean if (!connection.isClosed()) stm = connection.createStatement(); + else { + + + try + { + connection = getConnection(); + stm= connection.createStatement(); + } catch (Exception e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } stm.setMaxRows(numberOfHits); long time = System.currentTimeMillis(); + try { stm.execute(query); + } catch(Exception e) { + // TODO remove + // if(FM2SQL.fmInstance!=null) + // FM2SQL.showErrorDialog("Error caught!! \n Query was "+query+" \n","Debug Info"); + } long time2 = System.currentTimeMillis(); System.out.println("time to execute "+(time2-time)); @@ -1241,8 +1300,24 @@ public class DBBean // from FileMaker Pro container fields; the ResultSet.getObject // method returns a java.awt.Image object for FileMaker Pro // container fields + try + { + tableRow.addElement(resultSet.getDate(i)); - tableRow.addElement(resultSet.getDate(i)); + } catch (Exception e) + { + // work around for parse bug in FM JDBC Driver + // for dates of format dd-mm-yyyy + String date=resultSet.getString(i); + date=date.replace('-','.'); + java.text.DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,Locale.GERMAN); + java.util.Date d= dateFormat.parse(date); + // Calendar cal=Calendar.getInstance(Locale.GERMAN); + // cal.setTime(d); + // date=(cal.get(Calendar.YEAR))+"-"+(cal.get(Calendar.MONTH)+1)+"-"+cal.get(Calendar.DATE); + tableRow.addElement(new java.sql.Date(d.getTime())); + System.out.println("Date "+date); + } // m_columnClasses.addElement(java.sql.Date.class); } else if (metaData.getColumnTypeName(i) == "NUMBER") { @@ -1252,7 +1327,7 @@ public class DBBean // container fields try { - tableRow.addElement(new Integer(resultSet.getInt(i))); + tableRow.addElement(new Double(resultSet.getDouble(i))); // m_columnClasses.addElement(Integer.class); } catch (Exception e) @@ -1291,6 +1366,14 @@ public class DBBean tableRow.addElement((b != null) ? new String(utf8.getBytes()) : null); else { + if(url.toLowerCase().indexOf("odbc")>=0) + { + byte[] val = resultSet.getBytes(i); + for(int j=0;j