sqlite: autoquote table names that start with numbers to better suppo…

…rt natural earth conversions from shapefiles

plugins/input/sqlite/sqlite_datasource.cpp

@@ -159,6 +159,15 @@ void sqlite_datasource::bind() const
     {
         using_subquery_ = true;
     }
+    else
+    {
+        // attempt to auto-quote table if needed
+        if (sqlite_utils::needs_quoting(table_))
+        {
+            table_ = std::string("[") + table_ + "]";
+            geometry_table_ = table_;
+        }
+    }
 
     // now actually create the connection and start executing setup sql
     dataset_ = boost::make_shared<sqlite_connection>(dataset_name_);

plugins/input/sqlite/sqlite_datasource.hpp

@@ -56,7 +56,7 @@ class sqlite_datasource : public mapnik::datasource
     int type_;
     mutable std::string dataset_name_;
     mutable boost::shared_ptr<sqlite_connection> dataset_;
-    std::string table_;
+    mutable std::string table_;
     std::string fields_;
     std::string metadata_;
     mutable std::string geometry_table_;

plugins/input/sqlite/sqlite_utils.hpp

@@ -55,6 +55,34 @@ class sqlite_utils
 {
 public:
 
+    static bool needs_quoting(std::string const& name)
+    {
+        if (name.size() > 0)
+        {
+            const char first = name[0];
+            if (is_quote_char(first))
+            {
+                return false;
+            }
+            if ((first >= '0' && first <= '9') ||
+                (name.find("-") != std::string::npos)
+               )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static bool is_quote_char(const char z)
+    {
+        if (z == '"' || z == '\'' || z == '[' || z == '`')
+        {
+            return true;
+        }
+        return false;
+    }
+
     static void dequote(std::string & z)
     {
         boost::algorithm::trim_if(z,boost::algorithm::is_any_of("[]'\"`"));