manqod 1.1556.0 → 1.1559.0

data/lib/FormHolder/Form/InputHolder/QBuilder.rb

@@ -66,6 +66,7 @@ class QBuilder <  Gtk::HPaned
 				pack_start(@autotest=Gtk::ToggleButton.new("auto")).
 				pack_start(@test_now=Gtk::Button.new("test")).
 				pack_start(@view_sql=Gtk::Button.new("show")).
+				pack_start(@explain_sql=Gtk::Button.new("explain")).
 				pack_start(@save_as_view=Gtk::Button.new("store")),false,true).
 			pack_start(Gtk::ScrolledWindow.new.set_policy(Gtk::PolicyType::AUTOMATIC,Gtk::PolicyType::AUTOMATIC).add_with_viewport(@result=Gtk::Button.new),false)
 		@where.buffer.set_language(Gtk::SourceLanguageManager.new.get_language("sql")) if whsv
@@ -91,13 +92,40 @@ class QBuilder <  Gtk::HPaned
 		@view_sql.signal_connect("pressed"){|me|
 				save_query
 				w=Gtk::Dialog.new(@name.text,parentM.get_ancestor(Gtk::Window),Gtk::Dialog::DESTROY_WITH_PARENT ,[ Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE ])
-				w.vbox.add(Gtk::ScrolledWindow.new.add(sview=Gtk::SourceView.new.set_editable(false))).set_size_request(600,400)
+				w.vbox.add(Gtk::ScrolledWindow.new.add(sview=Gtk::SourceView.new.set_editable(false))).set_size_request(800,400)
 				sview.buffer.set_text(sql).set_language(Gtk::SourceLanguageManager.new.get_language("sql"))
 				sview.set_highlight_current_line(true).
 					set_show_line_numbers(true)
 				w.show_all
 				w.run{|response| w.destroy}
 		}
+		@explain_sql.signal_connect("pressed"){|me|
+				save_query
+				w=Gtk::Dialog.new(@name.text,parentM.get_ancestor(Gtk::Window),Gtk::Dialog::DESTROY_WITH_PARENT ,[ Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE ])
+				w.vbox.add(Gtk::ScrolledWindow.new.add(eview=Gtk::TreeView.new(emodel=Gtk::ListStore.new(String,String,String,String,String,String,String,String,String)))).set_size_request(1000,400)
+				eheader={0=>{:data=>'id',:header=>'Id'},
+					1=>{:data=>'select_type',:header=>'Select Type'},
+					2=>{:data=>'table',:header=>'Table'},
+					3=>{:data=>'type',:header=>'Type'},
+					4=>{:data=>'possible_keys',:header=>'Possible Keys'},
+					5=>{:data=>'key',:header=>'Key'},
+					6=>{:data=>'ref',:header=>'Ref'},
+					7=>{:data=>'rows',:header=>'Rows'},
+					8=>{:data=>'Extra',:header=>'Extra'}
+				}
+				eheader.each_pair{|hid,h|
+					eview.append_column(Gtk::TreeViewColumn.new(h[:header],Gtk::CellRendererText.new, {:text => hid}))
+				}
+				begin
+				client_rows("explain #{sql}"){|row|
+					iter=emodel.append
+					eheader.each_pair{|hid,h| iter[hid]=row[h[:data]] }
+				}
+				rescue
+				end
+				w.show_all
+				w.run{|response| w.destroy}
+		}
 		@result.signal_connect("pressed"){|me,ev|
 				begin
 					w=Gtk::Dialog.new(@name.text,parentM.get_ancestor(Gtk::Window),Gtk::Dialog::DESTROY_WITH_PARENT ,[ Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_NONE ])

data/lib/ListHolder/EditableList/CellRenderers/Combo.rb

@@ -12,6 +12,8 @@ class MyCellRendererCombo < Gtk::CellRendererCombo
 		set_text_column(1)
 		set_has_entry(false)
 		
+		set_ellipsize(Pango::ELLIPSIZE_END)
+		set_ellipsize_set(true)
 		set_mode(Gtk::CellRenderer::MODE_EDITABLE)
 
 		signal_connect("edited"){|me,path,new_text|

data/lib/ListHolder/EditableList/CellRenderers/Text.rb

@@ -6,9 +6,9 @@ class MyCellRendererText < Gtk::CellRendererText
 	def initialize(column)
 		@jump_to_next=false
 		super()
-#		set_ellipsize(Pango::ELLIPSIZE_NONE) #?
-#		set_ellipsize_set(true) #?
-#		set_wrap_mode(Pango::WRAP_WORD) #?
+		set_ellipsize(Pango::ELLIPSIZE_END)
+		set_ellipsize_set(true)
+#		set_wrap_mode(Pango::WRAP_WORD)
 		signal_connect("edited") { |me,path,new_value|
 			view.list_model.change_value_of_path(path,column.header['data'],new_value)
 			if @jump_to_next

data/lib/RelationBuilder/RTable.rb

@@ -146,13 +146,13 @@ class RTable < Gtk::EventBox
 		}
 
 		save_me
-		set_table(new_table)
-		parentM.reload_server_rb
+		set_table(@table)
+		parentM.reload_server_rb(true,@table)
 	end
 
 	def save_me
 		query("update tables set rbx='#{x}', rby='#{y}', name='#{@table}' where id='#{table_id}'")
-		@parentM.reload_server_rb
+		@parentM.reload_server_rb(false,@table)
 	end
 	
 	def show_me
@@ -205,7 +205,7 @@ class RTable < Gtk::EventBox
 			@fields[field].destroy
 			@fields.delete(field)
 			parentM.clear
-			parentM.reload_server_rb
+			parentM.reload_server_rb(true,@table)
 		end
 		dialog.destroy
 	end
@@ -275,7 +275,7 @@ class RTable < Gtk::EventBox
 			rescue =>err
 				retry if tell_exception("error altering the table",backtrace_to_debug(err),"server","error",false,true,err)
 			end
-			parentM.reload_server_rb
+			parentM.reload_server_rb(true,@table)
 		end
 		dialog.destroy
 	end

data/lib/RelationBuilder/Relation.rb

@@ -80,7 +80,7 @@ class Relation
 		else
 			query("update relations set src_table = '#{@rfield1.table.table}', dst_table = '#{@rfield2.table.table}', src_field='#{@rfield1.field["Field"]}', dst_field='#{@rfield2.field["Field"]}', rel_type='#{@rel_type}', rbx='#{@handle.x}', rby='#{@handle.y}', rel_name='#{@rel_name}', rel_custom='#{@rel_custom}' where id='#{@relation_id}'")
 			einfo("updated","relation-builder")
-			parentM.reload_server_rb
+			parentM.reload_server_rb(true,nil,@relation_id)
 		end
 	end
 	
@@ -93,7 +93,7 @@ class Relation
 		parentM.relations.delete(self)
 		parentM.clear
 		@handle.destroy unless @handle.destroyed?
-		@parentM.reload_server_rb
+		@parentM.reload_server_rb(true,nil,@relation_id)
 	end
 
 	def edit

data/lib/RelationBuilder.rb

@@ -85,6 +85,11 @@ class RelationBuilder < Gtk::ScrolledWindow
 					end
 				}
 
+				menu.append(reload_srv=Gtk::ImageMenuItem.new("Reload Server Model").set_image(Gtk::Image.new(Gtk::Stock::REFRESH,Gtk::IconSize::MENU)))
+				reload_srv.signal_connect("activate"){|me|
+					reload_server_rb
+				}
+
 				menu.show_all
 				menu.popup(nil,nil,ev.button,ev.time)
 				end
@@ -426,20 +431,21 @@ class RelationBuilder < Gtk::ScrolledWindow
 		client.query("drop table `#{table}`") if from_sql
 		@tables[table].widget.destroy
 		@tables.delete(table)
-		reload_server_rb(true)
+		reload_server_rb(true,table)
 		changed(@tables[table])
 	end
+
 	def add_existing_table(table_name)
 		unless @tables.has_key?(table_name)
 			query("insert into tables (name,rbx,rby) values('#{table_name}','#{@widget.pointer[0]}','#{@widget.pointer[1]}')")
-			reload_server_rb(true)
+			reload_server_rb(true,table_name)
 		end
 	end
 	
-	def reload_server_rb(reload_me_too=true)
+	def reload_server_rb(reload_me_too=true,table=nil,relation=nil)
 		Thread.new{
-		ManqodDB.instance.manqod_db.relation_builder.update if ManqodDB.instance.manqod_db.relation_builder
-		reload if reload_me_too
+			ManqodDB.instance.manqod_db.relation_builder.update(table,relation) if ManqodDB.instance.manqod_db.relation_builder
+			reload if reload_me_too
 		}
 	end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1556
+  - 1559
   - 0
-  version: 1.1556.0
+  version: 1.1559.0
 platform: ruby
 authors: 
 - Dobai-Pataky Balint
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +03:00
+date: 2011-06-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency