[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r5826 - trunk/Providers/SQLite/Src/Provider
From:       svn_fdo () osgeo ! org
Date:       2010-11-22 14:00:59
Message-ID: 20101122140059.0CB83390613 () trac ! osgeo ! org
[Download RAW message or body]

Author: romicadascalescu
Date: 2010-11-22 06:00:58 -0800 (Mon, 22 Nov 2010)
New Revision: 5826

Modified:
   trunk/Providers/SQLite/Src/Provider/SltConversionUtils.cpp
   trunk/Providers/SQLite/Src/Provider/SltProvider.cpp
Log:
#504 SQLite provider. Improvements:
 - Fixed a typo leading to a crash (::iterator iter = iter = )
 - Minor fix in extracting the table name to handle cases like name;

Modified: trunk/Providers/SQLite/Src/Provider/SltConversionUtils.cpp
===================================================================
--- trunk/Providers/SQLite/Src/Provider/SltConversionUtils.cpp	2010-11-22 10:42:52 UTC (rev 5825)
+++ trunk/Providers/SQLite/Src/Provider/SltConversionUtils.cpp	2010-11-22 14:00:58 UTC (rev 5826)
@@ -100,9 +100,16 @@
     else if (StringStartsWith(str, "\"main\"."))
         str = str + 7;
     if (*str == '\"')
+    {
         return std::string(str+1, (int)(strTmp-str-2));
+    }
     else
-        return std::string(str, (int)(strTmp-str));
+    {
+        std::string ret(str, (int)(strTmp-str));
+        if (ret.size() && ret[ret.size()-1] == ';')
+            ret.resize(ret.size()-1);
+        return ret;
+    }
 }
 
 // skips a predefined token whihc cannot contain space character

Modified: trunk/Providers/SQLite/Src/Provider/SltProvider.cpp
===================================================================
--- trunk/Providers/SQLite/Src/Provider/SltProvider.cpp	2010-11-22 10:42:52 UTC (rev 5825)
+++ trunk/Providers/SQLite/Src/Provider/SltProvider.cpp	2010-11-22 14:00:58 UTC (rev 5826)
@@ -4123,7 +4123,7 @@
     else
     {
         //clear the cached schema metadata
-        for (MetadataCache::iterator iter = iter = m_mNameToMetadata.begin();
+        for (MetadataCache::iterator iter = m_mNameToMetadata.begin();
             iter != m_mNameToMetadata.end(); iter++)
         {
              delete iter->second;

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits
[prev in list] [next in list] [prev in thread] [next in thread]