Revision 38380 trunk/libraries/libGDBMS/src/main/java/com/hardcode/gdbms/driver/odbc/ODBCDriver.java

View differences:

ODBCDriver.java
14 14 
import java.text.DateFormat;
15 15 
import java.text.SimpleDateFormat;
16 16 
import java.util.HashMap;
17 
import java.util.Properties;
17 18 

  		




  18
  19
  
    
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;


  		




  19
  20
  
    
import com.hardcode.gdbms.engine.data.DataSourceFactory;


  		




  ......




  80
  81
  
    
        if ((user != null) && (!user.equalsIgnoreCase(""))) {


  		




  81
  82
  
    
            connectionString += (";UID=" + user + ";PWD=" + password);


  		




  82
  83
  
    
        }


  		




  83
  
  
    

  		




  84
  
  
    
        return DriverManager.getConnection(connectionString);


  		




  
  84
  
    
        Properties prop = new Properties();


  		




  
  85
  
    
        // TODO: Pasar como par?metro el charset... aunque lo he probado y no va bien con cir?lico


  		




  
  86
  
    
//        prop.put("charSet", "ISO-8859-5");


  		




  
  87
  
    
        if (user != null)


  		




  
  88
  
    
        	prop.put("user", user);


  		




  
  89
  
    
        if (password != null)


  		




  
  90
  
    
        	prop.put("password", password);        


  		




  
  91
  
    
        return DriverManager.getConnection(connectionString, prop);


  		




  85
  92
  
    
    }


  		




  86
  93
  
    

  		




  87
  94
  
    
    /**


  		












Also available in:  Unified diff