[GRASS-SVN] r67360 - grass/branches/releasebranch_7_0/scripts/v.db.renamecolumn

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-24 05:04:08 -0800 (Thu, 24 Dec 2015)
New Revision: 67360

Modified:
   grass/branches/releasebranch_7_0/scripts/v.db.renamecolumn/v.db.renamecolumn.py
Log:
v.db.renamecolumn mysql error (#2819) - applied patch proposed by Markus Neteler
                  (merge r67315, r67359 from trunk)


Modified: grass/branches/releasebranch_7_0/scripts/v.db.renamecolumn/v.db.renamecolumn.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.db.renamecolumn/v.db.renamecolumn.py	2015-12-24 13:02:46 UTC (rev 67359)
+++ grass/branches/releasebranch_7_0/scripts/v.db.renamecolumn/v.db.renamecolumn.py	2015-12-24 13:04:08 UTC (rev 67360)
@@ -97,6 +97,14 @@
         sql = "UPDATE %s SET %s=%s" % (table, newcol, oldcol)
         grass.write_command('db.execute', input = '-', database = database, driver = driver, stdin = sql)
         grass.run_command('v.db.dropcolumn', map = map, layer = layer, column = oldcol)
+    elif driver == 'mysql':
+        if oldcoltype.upper() == "CHARACTER":
+            newcoltype = "varchar(%s)" % (oldcollength)
+        else:
+            newcoltype = oldcoltype
+
+        sql = "ALTER TABLE %s CHANGE %s %s %s" % (table, oldcol, newcol, newcoltype)
+        grass.write_command('db.execute', input = '-', database = database, driver = driver, stdin = sql)
     else:
         sql = "ALTER TABLE %s RENAME %s TO %s" % (table, oldcol, newcol)
         grass.write_command('db.execute', input = '-', database = database, driver = driver, stdin = sql)