The branch, master has been updated
via 2de2e87af77cbfc0434673ce41f4dc8daa336a8c (commit)
via ddd80be1cbb46eaec33fe362522e12d811b480d1 (commit)
via f1745c155d8e5cb2560e0ac926a8b6aeb76ac820 (commit)
via 1fd6beb74f88660b56c4cb8537f2a5e74df5ed39 (commit)
from 369c9c550a82cd97ebd914a0f8ad0e32d390dee3 (commit)
- Log -----------------------------------------------------------------
commit 2de2e87af77cbfc0434673ce41f4dc8daa336a8c
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 10:05:32 2011 +0530
Adding missing semicolons
commit ddd80be1cbb46eaec33fe362522e12d811b480d1
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 10:00:47 2011 +0530
Typo
commit f1745c155d8e5cb2560e0ac926a8b6aeb76ac820
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 09:56:05 2011 +0530
Drizzle does not support GIS data types. So no need to import ESRI shape files
commit 1fd6beb74f88660b56c4cb8537f2a5e74df5ed39
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 21 08:49:55 2011 +0530
Drizzle does not have GIS data types
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 45 ++++++++++++++++++++---------------------
libraries/display_tbl.lib.php | 18 +++++++++-------
libraries/import/shp.php | 5 ++++
3 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 097d9af..599865e 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -95,7 +95,7 @@ $(document).ready(function() {
*/
$("#sqlqueryresults").live('makegrid', function() {
PMA_makegrid($('#table_results')[0]);
- })
+ });
/**
* Append the "Show/Hide query box" message to the query input form
@@ -114,7 +114,7 @@ $(document).ready(function() {
// Attach the toggling of the query box visibility to a click
$("#togglequerybox").bind('click', function() {
- var $link = $(this)
+ var $link = $(this);
$link.siblings().slideToggle("fast");
if ($link.text() == PMA_messages['strHideQueryBox']) {
$link.text(PMA_messages['strShowQueryBox']);
@@ -127,7 +127,7 @@ $(document).ready(function() {
}
// avoid default click action
return false;
- })
+ });
}
/**
@@ -226,7 +226,7 @@ $(document).ready(function() {
}
// delete
if ('2' == data.action_bookmark) {
- $("#id_bookmark option[value='" + data.id_bookmark . "']").remove();
+ $("#id_bookmark option[value='" + data.id_bookmark + "']").remove();
}
// fade out previous messages, if any
$('.success').fadeOut();
@@ -235,8 +235,8 @@ $(document).ready(function() {
$('#sqlqueryform').before(data.message);
}
PMA_ajaxRemoveMessage($msgbox);
- }) // end $.post()
- }) // end SQL Query submit
+ }); // end $.post()
+ }); // end SQL Query submit
/**
* Ajax Event handlers for Paginating the results table
@@ -270,8 +270,8 @@ $(document).ready(function() {
PMA_init_slider();
PMA_ajaxRemoveMessage($msgbox);
- }) // end $.post()
- })// end Paginate results table
+ }); // end $.post()
+ }); // end Paginate results table
/**
* Paginate results with Page Selector dropdown
@@ -293,12 +293,12 @@ $(document).ready(function() {
.trigger('makegrid');
PMA_init_slider();
PMA_ajaxRemoveMessage($msgbox);
- }) // end $.post()
+ }); // end $.post()
} else {
$form.submit();
}
- })// end Paginate results with Page Selector
+ }); // end Paginate results with Page Selector
/**
* Ajax Event handler for sorting the results table
@@ -318,8 +318,8 @@ $(document).ready(function() {
.html(data)
.trigger('makegrid');
PMA_ajaxRemoveMessage($msgbox);
- }) // end $.get()
- })//end Sort results table
+ }); // end $.get()
+ }); //end Sort results table
/**
* Ajax Event handler for the display options
@@ -337,9 +337,8 @@ $(document).ready(function() {
.html(data)
.trigger('makegrid');
PMA_init_slider();
- }) // end $.post()
- })
- //end displayOptionsForm handler
+ }); // end $.post()
+ }); //end displayOptionsForm handler
/**
* Ajax Event for table row change
@@ -357,10 +356,10 @@ $(document).ready(function() {
*/
var button_options = {};
// in the following function we need to use $(this)
- button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
+ button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();};
var button_options_error = {};
- button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();}
+ button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();};
var $form = $("#resultsForm");
var $msgbox = PMA_ajaxShowMessage();
@@ -378,7 +377,7 @@ $(document).ready(function() {
$('#change_row_dialog').remove();
},
buttons : button_options_error
- })// end dialog options
+ }); // end dialog options
} else {
div
.append(data)
@@ -399,7 +398,7 @@ $(document).ready(function() {
$("#buttonYes").addClass("ajax");
}
PMA_ajaxRemoveMessage($msgbox);
- }) // end $.get()
+ }); // end $.get()
} else {
PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']);
}
@@ -442,8 +441,8 @@ $(document).ready(function() {
$("#sqlqueryresults").prepend(data.sql_query);
$("#result_query .notice").remove();
$("#result_query").prepend((data.message));
- }) // end $.post()
- }) // end insert table button "Go"
+ }); // end $.post()
+ }); // end insert table button "Go"
/**$("#buttonYes.ajax").live('click'
* Click action for #buttonYes button in ajax dialog insertForm
@@ -496,10 +495,10 @@ $(document).ready(function() {
if ($("#change_row_dialog").length > 0) {
$("#change_row_dialog").dialog("close").remove();
}
- }) // end $.post()
+ }); // end $.post()
});
-}, 'top.frame_content') // end $(document).ready()
+}, 'top.frame_content'); // end $(document).ready()
/**
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 43367bd..704a96b 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -668,14 +668,16 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
PMA_display_html_checkbox('hide_transformation', __('Hide') . ' ' . __('Browser transformation'), ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
echo '</div>';
- echo '<div class="formelement">';
- $choices = array(
- 'GEOM' => __('Geometry'),
- 'WKT' => __('Well Known Text'),
- 'WKB' => __('Well Known Binary')
- );
- PMA_display_html_radio('geometry_display', $choices, $_SESSION['tmp_user_values']['geometry_display']);
- echo '</div>';
+ if (! PMA_DRIZZLE) {
+ echo '<div class="formelement">';
+ $choices = array(
+ 'GEOM' => __('Geometry'),
+ 'WKT' => __('Well Known Text'),
+ 'WKB' => __('Well Known Binary')
+ );
+ PMA_display_html_radio('geometry_display', $choices, $_SESSION['tmp_user_values']['geometry_display']);
+ echo '</div>';
+ }
echo '<div class="clearfloat"></div>';
echo '</fieldset>';
diff --git a/libraries/import/shp.php b/libraries/import/shp.php
index 72ff7a7..977d117 100644
--- a/libraries/import/shp.php
+++ b/libraries/import/shp.php
@@ -9,6 +9,11 @@ if (! defined('PHPMYADMIN')) {
exit;
}
+// Drizzle does not suppost GIS data types
+if (PMA_DRIZZLE) {
+ return;
+}
+
if (isset($plugin_list)) {
$plugin_list['shp'] = array(
'text' => __('ESRI Shape File'),
hooks/post-receive
--
phpMyAdmin