old_sql 1.29.0 → 1.30.0

data/README.md

@@ -38,10 +38,6 @@ Old SQL is a Rails Engine database reporting gem that uses plain old SQL.
 
 ![jqGrid view](https://github.com/egonz/old_sql/raw/master/screenshots/jqgrid.png "jqGrid view")
 
-#### HTML Table
-
-![table view](https://github.com/egonz/old_sql/raw/master/screenshots/table.png "Table view")
-
 #### Google Charts
 
 ![table view](https://github.com/egonz/old_sql/raw/master/screenshots/chart.png "Chart view")

data/app/controllers/old_sql/report_controller.rb

@@ -224,7 +224,17 @@ module OldSql
 
     def db_list
       db = []
+      
       db << {name: Rails.env.capitalize, db_class: "active_record/base"}
+      
+      if File.directory?("#{Rails.root}/lib/old_sql/db")
+        Dir.glob("#{Rails.root}/lib/old_sql/db/*.rb") do |filename|
+          file_sans_ext = File.basename(filename, ".rb") 
+          db << {name: file_sans_ext.capitalize, db_class: "old_sql/db/#{file_sans_ext}"}
+        end
+      end
+      
+      db
     end
   end
 end

data/app/views/old_sql/report/_query.html.erb

@@ -1,25 +1,9 @@
-<script>
-$(document).ready(function($){
-	$('#run-query').bind('click', function() {
-      	query();
-    });
-
-	$('#delete-saved-queries').bind('click', function() {
-      	deleted_saved_queries();
-    });
-
-	$('#saved-queries-list').bind('click', function() {
-		$('#query-text').val($("#saved-queries-list option:selected").val()); 
-    });
-});
-</script>
-
 <div class="query">
 	<div>
 		DATABASE: 
 		<select name="query-db" id="query-db" onchange="db_selected()">
 		<% db_list.each do |db| %>
-			<option value="<%=db[:name]%>" class_name="<%=db[:class_name]%>"><%=db[:name]%></option>
+			<option value="<%=db[:name]%>" db_class="<%=db[:db_class]%>"><%=db[:name]%></option>
 		<% end %>
 		</select>
 	</div>
@@ -54,6 +38,12 @@ $(document).ready(function($){
 	</div>
 	
 	<div>
-		<input id="delete-saved-queries" type="submit" value="Clear" onclick="return true;" />
+		<span class="query-button">
+			<input id="delete-saved-query" type="submit" value="Delete" onclick="return true;" />
+		</span>
+		
+		<span class="query-button">
+			<input id="delete-saved-queries" type="submit" value="Remove All" onclick="return true;" />
+		</span>
 	</div>
 </div>

data/lib/generators/old_sql/install_generator.rb

@@ -51,6 +51,7 @@ module OldSql
       empty_directory "#{app_path}/config/old_sql/report_sql"
       empty_directory "#{app_path}/config/old_sql/report_design"
       empty_directory "#{app_path}/lib/old_sql/report_processor"
+      empty_directory "#{app_path}/lib/old_sql/db"
     end
     
     def copy_old_sql_files
@@ -60,6 +61,7 @@ module OldSql
       copy_file "user_processor.rb.example", "#{app_path}/lib/old_sql/report_processor/user_old_sql_demo_processor.rb"
       copy_file "user_design_template.csv", "#{app_path}/config/old_sql/report_design/user_old_sql_demo.csv"
       copy_file "user_old_sql_demo_chart_design.yml", "#{app_path}/config/old_sql/report_design/user_old_sql_demo.yml"
+      copy_file "test_db.rb", "#{app_path}/lib/old_sql/db/test.rb"
     end
     
     def configure_initializer

data/lib/generators/old_sql/templates/test_db.rb

@@ -0,0 +1,11 @@
+require 'active_record'
+
+module OldSql
+  module Db
+    class Test < ActiveRecord::Base
+      config = YAML.load_file(File.join("#{File.dirname(__FILE__)}/../../../config/", 'database.yml'))
+      
+      establish_connection config['test']
+    end
+  end
+end

data/public/javascripts/old_sql/old_sql.js

@@ -1,24 +1,25 @@
 function load_report()
 {	
-	report_name = jQuery("#report option:selected").attr('name');
-	report_sql = jQuery("#report option:selected").attr('report_sql');
+	report_name = $("#report option:selected").attr('name');
+	report_sql = $("#report option:selected").attr('report_sql');
 	report_view = get_report_view();
 
 	if (!reported_selected(report_name)) return;
 
 	var src = "http://"+host+":"+port+"/sql/reports/"+report_view+"/?report="+report_name+
-	"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+"&report_sql="+
+	"&start_date="+$("#datepicker-start").val()+"&end_date="+$("#datepicker-end").val()+"&report_sql="+
 	report_sql+"&caption="+report_name;
 
-	jQuery('iframe').attr('src', src);
+	$('iframe').attr('src', src);
 
 	_report_loaded = true;
 }
 
 function query()
 {	
-	sql = jQuery("#query-text").val();
-	db = jQuery("#query-db option:selected").attr('class_name');
+	orig_sql = $("#query-text").val();
+	sql = orig_sql.replace(new RegExp( "\\n", "g" )," ");
+	db = $("#query-db option:selected").attr('db_class');
 	
 	if (!sql) {
 		alert('Invalid Query.');
@@ -27,9 +28,9 @@ function query()
 
 	var src = "http://"+host+":"+port+"/sql/reports/jqgrid/?&query="+sql+"&db="+db+"&caption=Ad Hoc Query&w="+$(document).width();
 
-	jQuery('iframe').attr('src', src);
+	$('iframe').attr('src', src);
 	
-	save_query(sql);
+	save_query(orig_sql);
 	load_saved_queries();
 }
 
@@ -81,36 +82,49 @@ function deleted_saved_queries()
 	}
 }
 
+function deleted_saved_query() 
+{
+	if (typeof(localStorage) == 'undefined' ) {
+		alert('Your browser does not support HTML5 localStorage. Try upgrading.');
+	} else {
+		localStorage.removeItem($("#saved-queries-list option:selected").val());
+		$('#saved-queries-list')
+    		.find('option:selected')
+    		.remove()
+    		.end();
+	}
+}
+
 function reset_report()
 {
-	jQuery('iframe').attr('src', "");
+	$('iframe').attr('src', "");
 }
 
 function print_report()
 {
-	report_name = jQuery("#report option:selected").attr('name');
-	report_sql = jQuery("#report option:selected").attr('report_sql');
+	report_name = $("#report option:selected").attr('name');
+	report_sql = $("#report option:selected").attr('report_sql');
 	report_view = get_report_view();
 
 	if (!reported_selected(report_name)) return;
 
 	var src = "http://"+host+":"+port+"/sql/reports/print/?report="+report_name+
-	"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+
-	"&report_sql="+report_sql+"&desc="+jQuery("#report option:selected").attr('desc');
+	"&start_date="+$("#datepicker-start").val()+"&end_date="+$("#datepicker-end").val()+
+	"&report_sql="+report_sql+"&desc="+$("#report option:selected").attr('desc');
 	window.open(src,'Old SQL Report')
 }
 
 function export_report_to_excel()
 {
-	report_name = jQuery("#report option:selected").attr('name');
-	report_sql = jQuery("#report option:selected").attr('report_sql');
+	report_name = $("#report option:selected").attr('name');
+	report_sql = $("#report option:selected").attr('report_sql');
 	report_view = get_report_view();
 
 	if (!reported_selected(report_name)) return;
 
 	var src = "http://"+host+":"+port+"/sql/reports/query.csv/?report="+report_name+
-	"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+
-	"&report_sql="+ report_sql+"&desc="+jQuery("#report option:selected").attr('desc');
+	"&start_date="+$("#datepicker-start").val()+"&end_date="+$("#datepicker-end").val()+
+	"&report_sql="+ report_sql+"&desc="+$("#report option:selected").attr('desc');
 	window.open(src,'DB Report')
 }
 
@@ -126,7 +140,7 @@ function reported_selected(report_name)
 
 function get_report_view()
 {
-	report_view = jQuery("#report option:selected").attr('report_view');
+	report_view = $("#report option:selected").attr('report_view');
 
 	if (report_view) {
 		return report_view;
@@ -135,29 +149,26 @@ function get_report_view()
 	}
 }
 
-jQuery(document).ready(function($){
-	jQuery("#datepicker-start").datetimepicker();
-	jQuery("#datepicker-start").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
-	jQuery("#datepicker-end").datetimepicker();
-	jQuery("#datepicker-end").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
+$(document).ready(function($){
+	$("#datepicker-start").datetimepicker();
+	$("#datepicker-start").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
+	$("#datepicker-end").datetimepicker();
+	$("#datepicker-end").datetimepicker( "option", "dateFormat", "yy/mm/dd" );
 
 	var now = new Date();
 	var tomorrow = new Date();
 	var two_weeks_ago = new Date();
 	two_weeks_ago.setDate(now.getDate() - 14);
 	tomorrow.setDate(now.getDate() + 1);
-	jQuery("#datepicker-start").attr('value', two_weeks_ago.format("yyyy/mm/dd HH:MM:ss"));
-	jQuery("#datepicker-end").attr('value', tomorrow.format("yyyy/mm/dd HH:MM:ss"));
+	$("#datepicker-start").attr('value', two_weeks_ago.format("yyyy/mm/dd HH:MM:ss"));
+	$("#datepicker-end").attr('value', tomorrow.format("yyyy/mm/dd HH:MM:ss"));
 	
 	//Setup key listeners for the ad hoc query textarea
 	$('#query-text').keydown(function (e) {
   		if (e.ctrlKey && e.keyCode == 13) {
     		e.preventDefault();
 			query();
-  		} else if (e.keyCode == 13) {
-			e.preventDefault();
-			$('#query-text').val($('#query-text').val()+' \n'); 
-		}
+  		}
 	});
 	
 	$('#tabs').bind('tabsselect', function(event, ui) {
@@ -174,6 +185,24 @@ jQuery(document).ready(function($){
 	});
 });
 
+$(document).ready(function($){
+	$('#run-query').bind('click', function() {
+      	query();
+    });
+
+	$('#saved-queries-list').bind('click', function() {
+		$('#query-text').val($("#saved-queries-list option:selected").val()); 
+    });
+
+	$('#delete-saved-queries').bind('click', function() {
+      	deleted_saved_queries();
+    });
+
+	$('#delete-saved-query').bind('click', function() {
+		deleted_saved_query(); 
+    });
+});
+
 $(function() {
 	$( "#tabs" ).tabs();
 });

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 Z
+date: 2011-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
@@ -72,6 +72,7 @@ files:
 - lib/generators/old_sql/templates/devise_model.rb.template
 - lib/generators/old_sql/templates/old_sql.rb
 - lib/generators/old_sql/templates/reports.yml.example
+- lib/generators/old_sql/templates/test_db.rb
 - lib/generators/old_sql/templates/user.erb.example
 - lib/generators/old_sql/templates/user_design_template.csv
 - lib/generators/old_sql/templates/user_old_sql_demo_chart_design.yml
@@ -197,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1716827423845911602
+      hash: -3392790754162754922
       segments: 
       - 0
       version: "0"