Moving '--pivot-column' to a General section (Issue sqlmapproject#437)

stamparm · stamparm · commit b7d4afcc63f9 · 2013-04-18T17:12:32.000+02:00
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
@@ -114,7 +114,6 @@
                                "getCount":          "boolean",
                                "dumpTable":         "boolean",
                                "dumpAll":           "boolean",
-                               "pivotColumn":       "string",
                                "search":            "boolean",
                                "db":                "string",
                                "tbl":               "string",
@@ -185,6 +184,7 @@
                                "hexConvert":        "boolean",
                                "oDir":              "string",
                                "parseErrors":       "boolean",
+                               "pivotColumn":       "string",
                                "saveCmdline":       "boolean",
                                "updateAll":         "boolean",
                                "tor":               "boolean",
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -365,9 +365,6 @@ def cmdLineParser():
         enumeration.add_option("--dump-all", dest="dumpAll", action="store_true",
                                help="Dump all DBMS databases tables entries")
 
-        enumeration.add_option("--pivot-column", dest="pivotColumn",
-                               help="Pivot column name")
-
         enumeration.add_option("--search", dest="search", action="store_true",
                                help="Search column(s), table(s) and/or database name(s)")
 
@@ -591,6 +588,9 @@ def cmdLineParser():
                                   action="store_true",
                                   help="Parse and display DBMS error messages from responses")
 
+        general.add_option("--pivot-column", dest="pivotColumn",
+                               help="Pivot column name")
+
         general.add_option("--save", dest="saveCmdline",
                             action="store_true",
                             help="Save options to a configuration INI file")
diff --git a/sqlmap.conf b/sqlmap.conf
@@ -398,9 +398,6 @@ dumpTable = False
 # Valid: True or False
 dumpAll = False
 
-# Pivot column name.
-pivotColumn = 
-
 # Search column(s), table(s) and/or database name(s).
 # Requires: db, tbl or col
 # Valid: True or False
@@ -640,7 +637,10 @@ oDir =
 # Valid: True or False
 parseErrors = False
 
-# Use Use Tor anonymity network.
+# Pivot column name.
+pivotColumn =
+
+# Use Tor anonymity network.
 # Valid: True or False
 tor = False
 
