[Tora-cvs] tora NEWS,1.889,1.890 tobrowser.cpp,1.115,1.116 todebug.cpp,1.109,1.110 toresultcols.cpp,1.69,1.70 toresultindexes.cpp,1.39,1.40 toresultplan.cpp,1.47,1.48 totemporary.cpp,1.3,1.4 totool.cpp,1.72,1.73

[<hp...@us...>]

Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv16317

Modified Files:
	NEWS tobrowser.cpp todebug.cpp toresultcols.cpp 
	toresultindexes.cpp toresultplan.cpp totemporary.cpp 
	totool.cpp 
Log Message:


Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.889
retrieving revision 1.890
diff -C2 -d -r1.889 -r1.890
*** NEWS	28 Jul 2003 00:01:57 -0000	1.889
--- NEWS	28 Jul 2003 10:58:35 -0000	1.890
***************
*** 1,4 ****
--- 1,5 ----
  1.3.11:
  
+ 2003-07-28: Use new utility function to check DB type. (Thanx Oliver Jehle)
  2003-07-27: Added mandrake RPM build to release scripts.
  2003-07-27: Fixed problem with background not display correctly initially.

Index: tobrowser.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tobrowser.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** tobrowser.cpp	26 Jul 2003 23:47:04 -0000	1.115
--- tobrowser.cpp	28 Jul 2003 10:58:35 -0000	1.116
***************
*** 123,127 ****
    }
    virtual bool canHandle(toConnection &conn)
!   { return conn.provider()=="Oracle"||conn.provider()=="MySQL"||conn.provider()=="PostgreSQL" || conn.provider()=="SapDB"; }
  };
  
--- 123,127 ----
    }
    virtual bool canHandle(toConnection &conn)
!   { return toIsOracle(conn)||toIsMySQL(conn)||toIsPostgreSQL(conn) || toIsSapDB(conn); }
  };
  
***************
*** 1436,1440 ****
  bool toBrowser::canHandle(toConnection &conn)
  {
!   return conn.provider()=="Oracle"||conn.provider()=="MySQL"||conn.provider()=="SapDB";
  }
  
--- 1436,1440 ----
  bool toBrowser::canHandle(toConnection &conn)
  {
!   return toIsOracle(conn)||toIsMySQL(conn)||toIsSapDB(conn);
  }
  
***************
*** 1670,1674 ****
        setPixmap(0,image);
        new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Indexes"));
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Constraints"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","References"));
--- 1670,1674 ----
        setPixmap(0,image);
        new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Indexes"));
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Constraints"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","References"));
***************
*** 1678,1682 ****
        new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Data"));
        new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Information"));
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Extents"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Script"));
--- 1678,1682 ----
        new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Data"));
        new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Information"));
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Extents"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Script"));
***************
*** 1685,1689 ****
        QPixmap image((const char **)view_xpm);
        setPixmap(0,image);
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","SQL"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
--- 1685,1689 ----
        QPixmap image((const char **)view_xpm);
        setPixmap(0,image);
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","SQL"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
***************
*** 1695,1699 ****
        QPixmap image((const char **)sequence_xpm);
        setPixmap(0,image);
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Script"));
--- 1695,1699 ----
        QPixmap image((const char **)sequence_xpm);
        setPixmap(0,image);
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Script"));
***************
*** 1702,1706 ****
        QPixmap image((const char **)function_xpm);
        setPixmap(0,image);
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Dependencies"));
--- 1702,1706 ----
        QPixmap image((const char **)function_xpm);
        setPixmap(0,image);
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Dependencies"));
***************
*** 1710,1714 ****
        QPixmap image((const char **)function_xpm);
        setPixmap(0,image);
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Information"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Columns"));
--- 1710,1714 ----
        QPixmap image((const char **)function_xpm);
        setPixmap(0,image);
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Information"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Columns"));
***************
*** 1720,1724 ****
        QPixmap image((const char **)index_xpm);
        setPixmap(0,image);
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Information"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Extents"));
--- 1720,1724 ----
        QPixmap image((const char **)index_xpm);
        setPixmap(0,image);
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Information"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Extents"));
***************
*** 1728,1732 ****
        QPixmap image((const char **)synonym_xpm);
        setPixmap(0,image);
!       if (conn.provider()=="Oracle") {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Script"));
--- 1728,1732 ----
        QPixmap image((const char **)synonym_xpm);
        setPixmap(0,image);
!       if (toIsOracle(conn)) {
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Grants"));
  	new toTemplateTableItem(conn,this,qApp->translate("toBrowser","Script"));

Index: todebug.cpp
===================================================================
RCS file: /cvsroot/tora/tora/todebug.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** todebug.cpp	27 Jul 2003 04:46:56 -0000	1.109
--- todebug.cpp	28 Jul 2003 10:58:35 -0000	1.110
***************
*** 145,149 ****
    virtual bool canHandle(toConnection &conn)
    {
!     if (conn.provider()!="Oracle")
        return false;
  #if 1
--- 145,149 ----
    virtual bool canHandle(toConnection &conn)
    {
!     if (!toIsOracle(conn))
        return false;
  #if 1

Index: toresultcols.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultcols.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** toresultcols.cpp	27 Jul 2003 00:35:02 -0000	1.69
--- toresultcols.cpp	28 Jul 2003 10:58:35 -0000	1.70
***************
*** 221,225 ****
      try {
        toConnection &conn=toCurrentConnection(view);
!       if (conn.provider()!="Oracle")
  	return QString::null;
        toQList resLst=toQuery::readQueryNull(conn,SQLInfo,
--- 221,225 ----
      try {
        toConnection &conn=toCurrentConnection(view);
!       if (!toIsOracle(conn))
  	return QString::null;
        toQList resLst=toQuery::readQueryNull(conn,SQLInfo,
***************
*** 495,499 ****
  
      QString sql=QString::fromLatin1("SELECT * FROM ");
!     if(conn.provider() == "PostgreSQL")
        table=name;
      else
--- 495,499 ----
  
      QString sql=QString::fromLatin1("SELECT * FROM ");
!     if(toIsPostgreSQL(conn))
        table=name;
      else
***************
*** 508,512 ****
      toQDescList desc=query.describe();
  
!     if (conn.provider()=="Oracle") {
        try {
  	toQuery query(conn,SQLComment,owner,name);
--- 508,512 ----
      toQDescList desc=query.describe();
  
!     if (toIsOracle(conn)) {
        try {
  	toQuery query(conn,SQLComment,owner,name);

Index: toresultindexes.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultindexes.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** toresultindexes.cpp	26 Jul 2003 23:47:04 -0000	1.39
--- toresultindexes.cpp	28 Jul 2003 10:58:35 -0000	1.40
***************
*** 45,49 ****
  bool toResultIndexes::canHandle(toConnection &conn)
  {
!   return toIsOracle(conn)||conn.provider()=="MySQL"||conn.provider()=="PostgreSQL"|| conn.provider()=="SapDB";
  }
  
--- 45,49 ----
  bool toResultIndexes::canHandle(toConnection &conn)
  {
!   return toIsOracle(conn)||toIsMySQL(conn)||toIsPostgreSQL(conn)|| toIsSapDB(conn);
  }
  
***************
*** 191,201 ****
    try {
      toConnection &conn=connection();
!     if(conn.provider()=="Oracle")
        Type=Oracle;
!     else if (conn.provider()=="MySQL")
        Type=MySQL;
!     else if (conn.provider()=="PostgreSQL")
        Type=PostgreSQL;
!     else if (conn.provider()=="SapDB")
        Type=SapDB;
      else
--- 191,201 ----
    try {
      toConnection &conn=connection();
!     if(toIsOracle(conn))
        Type=Oracle;
!     else if (toIsMySQL(conn))
        Type=MySQL;
!     else if (toIsPostgreSQL(conn))
        Type=PostgreSQL;
!     else if (toIsSapDB(conn))
        Type=SapDB;
      else

Index: toresultplan.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultplan.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** toresultplan.cpp	17 Jul 2002 10:39:08 -0000	1.47
--- toresultplan.cpp	28 Jul 2003 10:58:35 -0000	1.48
***************
*** 67,71 ****
  bool toResultPlan::canHandle(toConnection &conn)
  {
!   return toIsOracle(conn)||conn.provider()=="MySQL";
  }
  
--- 67,71 ----
  bool toResultPlan::canHandle(toConnection &conn)
  {
!   return toIsOracle(conn)||toIsMySQL(conn);
  }
  

Index: totemporary.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totemporary.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** totemporary.cpp	25 Jul 2003 14:47:39 -0000	1.3
--- totemporary.cpp	28 Jul 2003 10:58:35 -0000	1.4
***************
*** 121,125 ****
    virtual bool canHandle(toConnection &conn)
    {
!     if (conn.provider()!="Oracle")
        return false;
      if (conn.version()<"8.0")
--- 121,125 ----
    virtual bool canHandle(toConnection &conn)
    {
!     if (!toIsOracle(conn))
        return false;
      if (conn.version()<"8.0")

Index: totool.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totool.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** totool.cpp	27 Jul 2003 23:54:16 -0000	1.72
--- totool.cpp	28 Jul 2003 10:58:35 -0000	1.73
***************
*** 531,535 ****
  bool toTool::canHandle(toConnection &conn)
  {
!   return (conn.provider()=="Oracle");
  }
  
--- 531,535 ----
  bool toTool::canHandle(toConnection &conn)
  {
!   return (toIsOracle(conn));
  }