lib/agent/trackers/database_tracker.rb in site24x7_apminsight-1.9.1 vs lib/agent/trackers/database_tracker.rb in site24x7_apminsight-1.9.2

@@ -46,13 +46,31 @@
         sql.downcase!
         sqlArr = sql.split(" ")
         
         begin
           tableName = case sqlArr[0]
-                 when "select" then sqlArr[sqlArr.index("from")+1]
-                 when "insert" then sqlArr[sqlArr.index("into")+1]
+                 when "select" then 
+                   fromIndex = sqlArr.index("from");
+                   if(fromIndex != nil)
+                     sqlArr[fromIndex+1]
+                   else
+                     "-" 
+                   end
+                 when "insert" then 
+                    intoIndex = sqlArr.index("into");
+                   if(intoIndex != nil)
+                     sqlArr[intoIndex+1]
+                   else
+                     "-" 
+                   end
                  when "update" then sqlArr[1]
-                 when "delete" then sqlArr[sqlArr.index("from")+1]
+                 when "delete" then
+                   fromIndex = sqlArr.index("from");
+                   if(fromIndex != nil)
+                     sqlArr[fromIndex+1]
+                   else
+                     "-" 
+                   end
                  when "create" then sqlArr[1] + sqlArr[2]
                  when "alter" then sqlArr[1] + sqlArr[2]
                  when "drop" then sqlArr[1] + sqlArr[2]
                  when "show" then sqlArr[1] 
                  when "describe" then sqlArr[1] 
\ No newline at end of file