rails_db 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bda56acd502bd41a558aa1ed3b372c767f4f3d
-  data.tar.gz: 94e6098530d74c7018557c661a85fbcd5fa35855
+  metadata.gz: bbe9f9c6560e7360e74e2edbbe5f504ae13f1b31
+  data.tar.gz: f6af0d6abd5a343e1899dcb8eb329e3a1a12c874
 SHA512:
-  metadata.gz: d5c4166f834cd28646a61677b7c8be727766b4359251806db4b5e3af181a80ae83fd433002d48be4ff5e45b9754e006e23df7368fd3294d159c44be634b8f35f
-  data.tar.gz: 6af0ce12605da30d780d27172e90dac095dbbbc7b56ac42200025e5231affd66236dc8a42d3853e681bdf83b2d8e0afbafcf7e294b0c2ffe5bb5a79c36e23f6c
+  metadata.gz: 670c72a702fd40bbc38ee8971d98a6ed112b5cd50dcd5afa9272148783fa36c20366e72a2797a620adadac063fba400485610d09e276342a8e550606abd64862
+  data.tar.gz: f157de66f3b6acbc6e0a3d20845b2b72abae4a0c3744f9c10022890ddfcd958b68b990c731fe108a6a69ef789cbd66a099b241362484bd11982e3455603e865e

data/Rakefile

@@ -29,7 +29,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = '**/*_test.rb'
   t.verbose = false
 end
 

data/app/assets/javascripts/rails_db/application.js

@@ -8,6 +8,12 @@
 $(function(){
   $(document).foundation();
 
+  jQuery.expr[":"].icontains = jQuery.expr.createPseudo(function (arg) {
+    return function (elem) {
+        return jQuery(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+    };
+  });
+
   $('.per_page_pagination_select').on('change', function() {
     $(this).parents('form').submit();
   });
@@ -15,6 +21,6 @@ $(function(){
   $('#rails_db_tables_input').on('keyup', function() {
     value = $(this).val();
     $("#rails_db_tables a").show();
-    $("#rails_db_tables a:not(:contains('" + value + "'))").hide();
+    $("#rails_db_tables a:not(:icontains('" + value + "'))").hide();
   });
 });

data/app/controllers/rails_db/sql_controller.rb

@@ -2,20 +2,39 @@ module RailsDb
   class SqlController < RailsDb::ApplicationController
 
     def index
-      @sql = "#{params[:sql]}".strip
-      @sql_query = RailsDb::SqlQuery.new(@sql).execute
+      load_query
     end
 
     def execute
-      @sql = "#{params[:sql]}".strip
-      @sql_query = RailsDb::SqlQuery.new(@sql).execute
+      load_query
       render :index
     end
 
     def csv
+      load_query
+      send_data(@sql_query.to_csv, :type => 'text/csv; charset=utf-8; header=present', :filename => "results.csv")
+    end
+
+    def import
+    end
+
+    def import_start
+      @importer = SqlImport.new(params[:file])
+      result   = @importer.import
+      if result.ok?
+        flash[:notice] = 'File was successfully imported'
+      else
+        flash[:alert] = "Error occured during import: #{result.error.message}"
+      end
+      render :import
+    end
+
+
+    private
+
+    def load_query
       @sql = "#{params[:sql]}".strip
       @sql_query = RailsDb::SqlQuery.new(@sql).execute
-      send_data(@sql_query.to_csv, :type => 'text/csv; charset=utf-8; header=present', :filename => "results.csv")
     end
 
   end

data/app/helpers/rails_db/application_helper.rb

@@ -3,7 +3,7 @@ module RailsDb
     include ::FontAwesome::Rails::IconHelper
 
     def rails_db_tables
-      ActiveRecord::Base.connection.tables.sort - ['schema_migrations']
+      Database.tables
     end
 
     def title(str)

data/app/helpers/rails_db/flash_messages_helper.rb

@@ -0,0 +1,44 @@
+module RailsDb
+  module FlashMessagesHelper
+    # <div class="alert-box [success alert secondary]">
+    #   This is an alert box.
+    #   <a href="" class="close">&times;</a>
+    # </div>
+    DEFAULT_KEY_MATCHING = {
+      :alert     => :alert,
+      :notice    => :success,
+      :info      => :info,
+      :secondary => :secondary,
+      :success   => :success,
+      :error     => :alert,
+      :warning   => :warning
+    }
+    def display_flash_messages(key_matching = {})
+      key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
+      key_matching.default = :standard
+
+      result = capture do
+        flash.each do |key, value|
+          alert_class = key_matching[key.to_sym]
+          concat alert_box(value, alert_class)
+        end
+      end
+      flash.clear
+      result
+    end
+
+  private
+
+    def alert_box(value, alert_class)
+      content_tag :div, :data => { :alert => "" }, :class => "alert-box #{alert_class}" do
+        concat value
+        concat close_link
+      end
+    end
+
+    def close_link
+      link_to("&times;".html_safe, "#", :class => :close)
+    end
+
+  end
+end

data/app/views/layouts/rails_db/application.html.erb

@@ -10,6 +10,7 @@
 </head>
 
 <body>
+  <%= display_flash_messages %>
   <%= render 'rails_db/shared/header' %>
   <div class="row">
     <div class="large-9 push-3 columns">

data/app/views/rails_db/dashboard/index.html.erb

@@ -12,9 +12,12 @@
   <li>filter tables for easier navigation</li>
   <li>use history of you SQL queries</li>
   <li>see EXPLAIN results for your queries</li>
-  <li>export data</li>
-  <li>import data (future)</li>
+  <li>export data to CSV</li>
+  <li>import SQL files</li>
   <li>visualize SQL schema (future)</li>
+  <li>data-tables inside your app (future)</li>
+  <li>ajax-ify Rails DB (future)</li>
+  <li>CRUD for table records (future)</li>
 </ul>
 
 <br/>

data/app/views/rails_db/shared/_footer.html.erb

@@ -26,6 +26,13 @@
           SQL Editor
         <% end %>
       </li>
+      <li>|</li>
+      <li>
+        <%= link_to rails_db.sql_import_path do %>
+          <%= fa_icon 'download' %>
+          Import
+        <% end %>
+      </li>
       </ul>
     </div>
   </div>

data/app/views/rails_db/shared/_header.html.erb

@@ -17,6 +17,13 @@
           SQL Editor
         <% end %>
       </li>
+      <li>|</li>
+      <li>
+        <%= link_to rails_db.sql_import_path do %>
+          <%= fa_icon 'download' %>
+          Import
+        <% end %>
+      </li>
     </ul>
     <ul class="inline-list right main_nav">
       <li>

data/app/views/rails_db/sql/_import_sample.html.erb

@@ -0,0 +1,19 @@
+<div id="sample_modal" class="reveal-modal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
+  <h2 id="modalTitle">Sample</h2>
+  <div class='scrollable sql_history_items'>
+    <pre>
+      update users set email = 'e1@e.com' where id = 5;
+      update users set email = 'e2@e.com' where id = 6;
+      update users set email = 'e3@e.com' where id = 7;
+
+      CREATE TABLE MyGuests (
+        id INT(6) UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+        firstname VARCHAR(30) NOT NULL,
+        lastname VARCHAR(30) NOT NULL,
+        email VARCHAR(50),
+        reg_date TIMESTAMP
+      );
+    </pre>
+  </div>
+  <a class="close-reveal-modal" aria-label="Close">&#215;</a>
+</div>

data/app/views/rails_db/sql/import.html.erb

@@ -0,0 +1,37 @@
+<% title "SQL Editor" %>
+
+<%= form_tag :sql_start_import, multipart: true do %>
+  <h3>Import SQL File</h3>
+
+  <div class='row'>
+    <div class="large-11">
+      <label>
+        File
+        <%= file_field_tag :file %>
+      </label>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="large-11">
+      <p><span class="radius secondary label">* <%= RailsDb::Adapters::BaseAdapter::MULTI_STATEMENT_HELP_TEXT %></span></p>
+      <%= submit_tag raw("&rarr; Import"), class: 'button small' %>
+      &nbsp;
+      &mdash;
+      &nbsp;
+      <a href="#" data-reveal-id="sample_modal" id='sample_modal_link'><%= fa_icon('bars') %> Sample</a></span>
+      <%= render 'import_sample' %>
+    </div>
+  </div>
+
+  <% if @importer && @importer.result.ok? %>
+    <div class='row'>
+      <div class="large-11">
+        <h4>Results</h4>
+        <p>
+          <span class="radius success label">File was successfully imported</span>
+          <span class="radius info label">Time: <%= @importer.time %> seconds</span>
+        </p>
+  <% end %>
+
+<% end %>

data/config/routes.rb

@@ -7,6 +7,9 @@ RailsDb::Engine.routes.draw do
   get '/sql' => 'sql#index', as: :sql
   post '/execute' => 'sql#execute', as: :sql_execute
   post '/sql-csv' => 'sql#csv', as: :sql_csv
+
+  get '/import' => 'sql#import', as: :sql_import
+  post '/import-start' => 'sql#import_start', as: :sql_start_import
 end
 
 Rails.application.routes.draw do

data/lib/rails_db/adapters/base_adapter.rb

@@ -0,0 +1,26 @@
+module RailsDb
+  module Adapters
+
+    class BaseAdapter
+      extend ::RailsDb::Connection
+
+      MULTI_STATEMENT_HELP_TEXT = "EXPERIMENTAL: You can import only file with SQL statements separated by ';'. Each new statement must start from new line."
+
+      def self.execute(sql)
+        t0 = Time.now
+        connection.execute(sql)
+        Time.now - t0
+      end
+
+      def self.exec_query(sql, log = true)
+        t0 = Time.now
+        Rails.logger.debug "--> Executing: #{sql}" if log
+        results = connection.exec_query(sql)
+        execution_time = Time.now - t0
+        [results, execution_time]
+      end
+
+    end
+
+  end
+end

data/lib/rails_db/adapters/mysql.rb

@@ -0,0 +1,15 @@
+module RailsDb
+  module Adapters
+
+    class Mysql < BaseAdapter
+
+      def self.execute(sql)
+        sql.split(";\n").each do |statement|
+          connection.execute(statement)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/rails_db/adapters/postgres.rb

@@ -0,0 +1,9 @@
+module RailsDb
+  module Adapters
+
+    class Postgres < BaseAdapter
+
+    end
+
+  end
+end

data/lib/rails_db/adapters/sqlite.rb

@@ -0,0 +1,17 @@
+module RailsDb
+  module Adapters
+
+    class Sqlite < BaseAdapter
+
+      def self.execute(sql)
+        t0 = Time.now
+        sql.split(";\n").each do |statement|
+          connection.execute(statement)
+        end
+        Time.now - t0
+      end
+
+    end
+
+  end
+end

data/lib/rails_db/database.rb

@@ -0,0 +1,24 @@
+module RailsDb
+  class Database
+    include Connection
+    extend Connection
+
+    def self.tables
+      connection.tables.sort - ['schema_migrations']
+    end
+
+    def self.adapter
+      case connection.class.to_s
+      when /Mysql/
+        RailsDb::Adapters::Mysql
+      when /Postgre/
+        RailsDb::Adapters::Postgres
+      when /SQLite/
+        RailsDb::Adapters::Sqlite
+      else
+        RailsDb::Adapters::BaseAdapter
+      end
+    end
+
+  end
+end

data/lib/rails_db/rails_db_error.rb

@@ -0,0 +1,5 @@
+module RailsDb
+  class RailsDbError < StandardError
+
+  end
+end

data/lib/rails_db/result.rb

@@ -0,0 +1,19 @@
+module RailsDb
+  class Result
+
+    attr_reader :error
+
+    def initialize(error)
+      @error = error
+    end
+
+    def self.ok
+      Result.new(nil)
+    end
+
+    def ok?
+      error.nil?
+    end
+
+  end
+end

data/lib/rails_db/sql_import.rb

@@ -0,0 +1,26 @@
+module RailsDb
+  class SqlImport
+    include Connection
+
+    attr_reader :time, :result
+
+    def initialize(file)
+      @file = file
+    end
+
+    def valid?
+      if @file.nil?
+        raise RailsDbError.new('Please select valid SQL file and continue')
+      end
+    end
+
+    def import
+      valid?
+      @time = Database.adapter.execute(@file.read)
+      @result = Result.ok
+    rescue RailsDbError, ActiveRecord::StatementInvalid => e
+      @result = Result.new(e)
+    end
+
+  end
+end

data/lib/rails_db/sql_query.rb

@@ -17,7 +17,7 @@ module RailsDb
     end
 
     def load_data
-      @data ||= SqlQueryData.new(self).load_data
+      @data    ||= SqlQueryData.new(self).load_data
     end
 
     def execute

data/lib/rails_db/sql_query_data.rb

@@ -10,7 +10,7 @@ module RailsDb
     end
 
     def load_data
-      result, @time = SqlExecutor.new(sql).execute
+      result, @time = Database.adapter.exec_query(sql)
       @columns      = result.columns
       @rows         = result.rows
       self

data/lib/rails_db/table_data.rb

@@ -22,14 +22,13 @@ module RailsDb
         if per_page && offset
           commands.push("LIMIT #{per_page} OFFSET #{offset}")
         end
-        executor = SqlExecutor.new(commands.join(' '))
-        results, @time = executor.execute
+        results, @time = Database.adapter.exec_query(commands.join(' '))
         results
       end
     end
 
     def count
-      connection.exec_query("SELECT COUNT(*) FROM #{table.name}").rows.flatten.last.to_i
+      Database.adapter.exec_query("SELECT COUNT(*) FROM #{table.name}")[0].rows.flatten.last.to_i
     end
 
   end