periscope_rails 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    periscope_rails (0.0.9)
+    periscope_rails (0.0.10)
       activesupport (~> 3.0)
       rails (~> 3.0)
 

data/app/periscope/periscope_controller.rb

@@ -4,24 +4,34 @@ class PeriscopeController < ActionController::Base
 
   def look
     if !params[:sql].nil?
-      render :json => run_sql(params[:sql])
+      render :json => merge_on_metadata(run_sql(params[:sql]))
     else
-      render :json => {:error => "Command not understood"}
+      render :json => merge_on_metadata({:error => "Command not understood"})
     end
   end
 
   def login
-    render :json => get_info()
+    render :json => merge_on_metadata(get_info())
   end
 
   private
 
   def authenticate
     unless PeriscopeRails::Config.check_password(params[:password].to_s)
-      render :json => {:error => "Password invalid."}
+      render :json => merge_on_metadata({:error => "Password invalid."})
     end
   end
 
+  def merge_on_metadata(hash)
+    version = nil
+    begin
+      version = Gem.loaded_specs["periscope_rails"].version.version
+    rescue
+      version = "error"
+    end
+    return hash.merge({ :version => version, :database_type => get_db_type })
+  end
+
   def run_sql(sql_command)
     #TODO: protect based on CFG, not blacklist
     bad_words = %W{drop delete update into insert index add remove grant revoke create createdb}
@@ -39,13 +49,8 @@ class PeriscopeController < ActionController::Base
       begin #for whole query
         active_record = PeriscopeRails::Config.get_active_record()
         begin #just for costing
-          begin
-            is_postgres = ActiveRecord::Base.connection.instance_of? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-          rescue Exception => e
-            is_postgres = false
-          end
           active_record.transaction do #costing
-            if PeriscopeRails::Config.block_expensive_queries? and is_postgres
+            if PeriscopeRails::Config.block_expensive_queries? and get_db_type == "postgres"
               active_record.connection.select_all("explain #{command}")[0]["QUERY PLAN"] =~ /rows=(\d+) width=(\d+)\)$/
               row_count, width = $1.to_i, $2.to_i
               if row_count > 0 and width > 0
@@ -87,4 +92,20 @@ class PeriscopeController < ActionController::Base
     end
     return {:tables => tables, :error => nil}
   end
+
+  def get_db_type
+    begin
+      return "postgres" if ActiveRecord::Base.connection.instance_of? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    rescue Exception => e
+      begin
+        return "mysql" if ActiveRecord::Base.connection.instance_of? ActiveRecord::ConnectionAdapters::MysqlAdapter
+      rescue Exception => e
+        begin
+          return "mysql" if ActiveRecord::Base.connection.instance_of? ActiveRecord::ConnectionAdapters::Mysql2Adapter
+        rescue
+          return nil
+        end
+      end
+    end
+  end
 end

data/lib/periscope_rails/config.rb

@@ -10,7 +10,7 @@ module PeriscopeRails
     @@db_password = nil
 
     @@block_expensive_queries = true
-    @@max_rows = 500
+    @@max_rows = 2000
     @@max_size = @@max_rows * 500
 
     def self.set_password(password)

data/lib/periscope_rails/version.rb

@@ -1,3 +1,3 @@
 module PeriscopeRails
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/periscope_rails.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "Rails API for Periscope Database Viewer"
   s.description = "Periscope allows you to query your production database. The gem provides the API for Periscope to communicate with your Rails app."
   s.files = Dir["{app,lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
-  s.version = "0.0.9"
+  s.version = PeriscopeRails.const_get(:VERSION)
 
   s.add_dependency "activesupport" , "~> 3.0"
   s.add_dependency "rails"         , "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: periscope_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-06-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &27882840 !ruby/object:Gem::Requirement
+  requirement: &28279680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *27882840
+  version_requirements: *28279680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &27882528 !ruby/object:Gem::Requirement
+  requirement: &28279380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *27882528
+  version_requirements: *28279380
 description: Periscope allows you to query your production database. The gem provides
   the API for Periscope to communicate with your Rails app.
 email: