[Tora-cvs] SF.net SVN: tora: [2123] trunk/tora/src

[<nn...@us...>]

Revision: 2123
          http://tora.svn.sourceforge.net/tora/?rev=2123&view=rev
Author:   nneul
Date:     2007-09-15 15:22:55 -0700 (Sat, 15 Sep 2007)

Log Message:
-----------
add handling of more data types and failure to describe

Modified Paths:
--------------
    trunk/tora/src/tooracleconnection.cpp
    trunk/tora/src/toresultcols.cpp

Modified: trunk/tora/src/tooracleconnection.cpp
===================================================================
--- trunk/tora/src/tooracleconnection.cpp	2007-09-15 22:19:54 UTC (rev 2122)
+++ trunk/tora/src/tooracleconnection.cpp	2007-09-15 22:22:55 UTC (rev 2123)
@@ -444,7 +444,6 @@
  * http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10758/sqlqr06.htm
  * include ocidfn.h
  */
-#warning "Add more datatypes"
                 switch (description[i].dbtype)
                 {
                     case 1:	/* VARCHAR2, NVARCHAR2 */
@@ -507,7 +506,7 @@
 		        }
 #endif
 		        break;
-
+#ifdef OTL_ORA_NATIVE_TYPES
 		    case 100:	/* BINARY_FLOAT */
                         desc.Datatype = QString::fromLatin1("BINARY_FLOAT");
                         break;
@@ -515,7 +514,7 @@
 		    case 101:	/* BINARY_DOUBLE */
                         desc.Datatype = QString::fromLatin1("BINARY_DOUBLE");
                         break;
-
+#endif
 		    case 112:	/* CLOB, NCLOB */
                         desc.Datatype = QString::fromLatin1("CLOB");
 #ifdef OTL_ORA_UNICODE
@@ -529,11 +528,7 @@
 		    case 113:	/* BLOB */
                         desc.Datatype = QString::fromLatin1("BLOB");
                         break;
-
-		    case 114:	/* BFILE */
-                        desc.Datatype = QString::fromLatin1("BFILE");
-                        break;
-
+#ifdef OTL_ORA_TIMESTAMP
 		    case 187:	/* TIMESTAMP, docu: 180, ocidfn.h: 187 */
                         desc.Datatype = QString::fromLatin1("TIMESTAMP(%i)");
                         datatypearg1 = description[i].scale;
@@ -559,7 +554,7 @@
                         desc.Datatype = QString::fromLatin1("TIMESTAMP(%i) WITH LOCAL TIME ZONE");
                         datatypearg1 = description[i].scale;
                         break;
-
+#endif
                     default:
                         desc.Datatype = QString::fromLatin1("UNKNOWN");
 
@@ -787,8 +782,10 @@
 
                 return desc;
             }
-            catch (...)
-            {}
+            catch ( ... )
+            {
+                throw;
+            }
 
             toQDescList ret;
             return ret;

Modified: trunk/tora/src/toresultcols.cpp
===================================================================
--- trunk/tora/src/toresultcols.cpp	2007-09-15 22:19:54 UTC (rev 2122)
+++ trunk/tora/src/toresultcols.cpp	2007-09-15 22:22:55 UTC (rev 2123)
@@ -567,10 +567,7 @@
         describe(desc);
         Edit->describe(desc, table, false);
     }
-    catch (...)
-    {
-        toStatusMessage(tr("Failed to describe %1").arg(object));
-    }
+    TOCATCH
 }
 
 void toResultCols::resultCols::query(const toConnection::objectName &name, bool nocache)
@@ -593,10 +590,7 @@
         describe(desc);
         Edit->describe(desc, wholename, true);
     }
-    catch (...)
-    {
-        toStatusMessage(tr("Failed to describe %1").arg(name.Owner + QString::fromLatin1(".") + name.Name));
-    }
+    TOCATCH
 }
 
 void toResultCols::editComment(bool val)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.