* Drag and select an area in the plot to zoom into it.
* Click reset zoom link to come back to original state.
* Click a data point to view and possibly edit the data row.
* The plot can be resized by dragging it along the bottom right corner.
* Strings are converted into integer for plotting'); +$js_messages['strInputNull'] = __('Select two columns'); +$js_messages['strSameInputs'] = __('Select two different columns'); + /* For tbl_change.js */ $js_messages['strIgnore'] = __('Ignore'); diff --git a/js/tbl_select.js b/js/tbl_select.js index 3bc1137c5d..af2242ad5e 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -66,7 +66,7 @@ $(document).ready(function() { if (typeof response == 'string') { // found results $("#sqlqueryresults").html(response); - $("#sqlqueryresults").trigger('makegrid'); + $("#sqlqueryresults").trigger('appendAnchor'); $('#tbl_search_form') // work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome. .slideToggle() diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js new file mode 100644 index 0000000000..b9c0d75364 --- /dev/null +++ b/js/tbl_zoom_plot.js @@ -0,0 +1,605 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + ** @fileoverview JavaScript functions used on tbl_select.php + ** + ** @requires jQuery + ** @requires js/functions.js + **/ + + +/** + ** Display Help/Info + **/ +function displayHelp() { + var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'],10000); + msgbox.click(function() { + PMA_ajaxRemoveMessage(msgbox); + }); +} + +/** + ** Extend the array object for max function + ** @param array + **/ +Array.max = function (array) { + return Math.max.apply( Math, array ); +} + +/** + ** Extend the array object for min function + ** @param array + **/ +Array.min = function (array) { + return Math.min.apply( Math, array ); +} + +/** + ** Checks if a string contains only numeric value + ** @param n: String (to be checked) + **/ +function isNumeric(n) { + return !isNaN(parseFloat(n)) && isFinite(n); +} + +/** + ** Checks if an object is empty + ** @param n: Object (to be checked) + **/ +function isEmpty(obj) { + var name; + for (name in obj) { + return false; + } + return true; +} + +/** + ** Converts a timestamp into the format of its field type + ** @param val Integer Timestamp + ** @param type String Field type(datetime/timestamp/time/date) + **/ +function getDate(val,type) { + if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) + } + else if(type.toString().search(/time/i) != -1) { + return Highcharts.dateFormat('%H:%M:%S', val + 19800000) + } + else if (type.toString().search(/date/i) != -1) { + return Highcharts.dateFormat('%Y-%m-%e', val) + } +} + +/** + ** Converts a date/time into timestamp + ** @param val String Date + ** @param type Sring Field type(datetime/timestamp/time/date) + **/ +function getTimeStamp(val,type) { + if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) + } + else if(type.toString().search(/time/i) != -1) { + return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') + } + else if (type.toString().search(/date/i) != -1) { + return getDateFromFormat(val,'yyyy-MM-dd') + } +} + +/** + ** Classifies the field type into numeric,timeseries or text + ** @param field: field type (as in database structure) + **/ +function getType(field) { + if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + return 'numeric'; + else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + return 'time'; + else + return 'text'; +} +/** + ** Converts a categorical array into numeric array + ** @param array categorical values array + **/ +function getCord(arr) { + var newCord = new Array(); + var original = $.extend(true,[],arr); + var arr = jQuery.unique(arr).sort(); + $.each(original, function(index,value) { + newCord.push(jQuery.inArray(value,arr)); + }); + return [newCord,arr,original]; +} + +/** + ** Scrolls the view to the display section + **/ +function scrollToChart() { + var x = $('#dataDisplay').offset().top - 100; // 100 provides buffer in viewport + $('html,body').animate({scrollTop: x}, 500); +} + +$(document).ready(function() { + + /** + ** Set a parameter for all Ajax queries made on this page. Don't let the + ** web server serve cached pages + **/ + $.ajaxSetup({ + cache: 'false' + }); + + var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; + var currentChart = null; + var currentData = null; + var xLabel = $('#tableid_0').val(); + var yLabel = $('#tableid_1').val(); + var xType = $('#types_0').val(); + var yType = $('#types_1').val(); + var dataLabel = $('#dataLabel').val(); + + // Get query result + var data = jQuery.parseJSON($('#querydata').html()); + + /** + ** Input form submit on field change + **/ + $('#tableid_0').change(function() { + $('#zoom_search_form').submit(); + }) + + $('#tableid_1').change(function() { + $('#zoom_search_form').submit(); + }) + + $('#tableid_2').change(function() { + $('#zoom_search_form').submit(); + }) + + $('#tableid_3').change(function() { + $('#zoom_search_form').submit(); + }) + + /** + * Input form validation + **/ + $('#inputFormSubmitId').click(function() { + if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + else if (xLabel == yLabel) + PMA_ajaxShowMessage(PMA_messages['strSameInputs']); + }); + + /** + ** Prepare a div containing a link, otherwise it's incorrectly displayed + ** after a couple of clicks + **/ + $('') + .insertAfter('#zoom_search_form') + // don't show it until we have results on-screen + .hide(); + + $('#togglesearchformlink') + .html(PMA_messages['strShowSearchCriteria']) + .bind('click', function() { + var $link = $(this); + $('#zoom_search_form').slideToggle(); + if ($link.text() == PMA_messages['strHideSearchCriteria']) { + $link.text(PMA_messages['strShowSearchCriteria']); + } else { + $link.text(PMA_messages['strHideSearchCriteria']); + } + // avoid default click action + return false; + }); + + /** + ** Set dialog properties for the data display form + **/ + $("#dataDisplay").dialog({ + autoOpen: false, + title: 'Data point content', + modal: false, //false otherwise other dialogues like timepicker may not function properly + height: $('#dataDisplay').height() + 80, + width: $('#dataDisplay').width() + 80 + }); + + /* + * Handle submit of zoom_display_form + */ + + $("#submitForm").click(function(event) { + + //Prevent default submission of form + event.preventDefault(); + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original + var it = 4; + var xChange = false; + var yChange = false; + for (key in selectedRow) { + if (key != 'where_clause'){ + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal){ + selectedRow[key] = newVal; + newValues[key] = newVal; + if(key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } + else if(key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } + } + it++ + }//End data update + + //Update the chart series and replot + if (xChange || yChange) { + var newSeries = new Array(); + newSeries[0] = new Object(); + newSeries[0].marker = { + symbol: 'circle' + }; + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + if(xChange) { + xCord[currentData] = selectedRow[xLabel]; + if(xType == 'numeric') { + currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); + currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); + } + else if(xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data,function(key,value) { + if(yType != 'text') + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + else + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + i++; + }); + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } + } + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } + + } + if(yChange) { + + yCord[currentData] = selectedRow[yLabel]; + if(yType == 'numeric') { + currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); + currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); + } + else if(yType =='time') { + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; + + $.each(data,function(key,value) { + if(xType != 'text' ) + newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + else + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + i++; + }); + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } + } + currentChart.series[0].data[currentData].select(); + } + //End plot update + + //Generate SQL query for update + if (!isEmpty(newValues)) { + var sql_query = 'UPDATE `' + window.parent.table + '` SET '; + for (key in newValues) { + if(key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if(!isNumeric(value) && value != null) + sql_query += '\'' + value + '\' ,'; + else + sql_query += value + ' ,'; + } + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { + 'token' : window.parent.token, + 'db' : window.parent.db, + 'ajax_request' : true, + 'sql_query' : sql_query, + 'inline_edit' : false + }, function(data) { + if(data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } + else + PMA_ajaxShowMessage(data.error); + })//End $.post + }//End database update + $("#dataDisplay").dialog("close"); + });//End submit handler + + /* + * Generate plot using Highcharts + */ + + if (data != null) { + $('#zoom_search_form') + .slideToggle() + .hide(); + $('#togglesearchformlink') + .text(PMA_messages['strShowSearchCriteria']) + $('#togglesearchformdiv').show(); + var selectedRow; + var columnNames = new Array(); + var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; + var series = new Array(); + var xCord = new Array(); + var yCord = new Array(); + var xCat = new Array(); + var yCat = new Array(); + var tempX, tempY; + var it = 0; + + // Set the basic plot settings + var currentSettings = { + chart: { + renderTo: 'querychart', + type: 'scatter', + zoomType: 'xy', + width:$('#resizer').width() -3, + height:$('#resizer').height()-20 + }, + credits: { + enabled: false + }, + exporting: { enabled: false }, + label: { text: $('#dataLabel').val() }, + plotOptions: { + series: { + allowPointSelect: true, + cursor: 'pointer', + showInLegend: false, + dataLabels: { + enabled: false, + }, + point: { + events: { + click: function() { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { + 'ajax_request' : true, + 'get_data_row' : true, + 'db' : window.parent.db, + 'table' : window.parent.table, + 'where_clause' : data[id]['where_clause'], + 'token' : window.parent.token, + } + $.post('tbl_zoom_select.php', post_params, function(data) { + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) + $('#fields_null_id_' + fid).attr('checked', true); + else + $('#fieldID_' + fid).val(data.row_info[key]); + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; + }); + + $("#dataDisplay").dialog("open"); + }, + } + } + } + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, + title: { text: 'Query Results' }, + xAxis: { + title: { text: $('#tableid_0').val() }, + }, + yAxis: { + min: null, + title: { text: $('#tableid_1').val() }, + }, + } + + $('#resizer').resizable({ + resize: function() { + currentChart.setSize( + this.offsetWidth -3, + this.offsetHeight -20, + false + ); + } + }); + + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); + + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + + // Formulate series data for plot + series[0] = new Object(); + series[0].data = new Array(); + series[0].marker = { + symbol: 'circle' + }; + if (xType != 'text' && yType != 'text') { + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; + }); + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} + } + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} + } + + } + + else if (xType =='text' && yType !='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + tempX = getCord(xCord); + $.each(data,function(key,value) { + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); + it++; + }); + + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } + } + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} + } + xCord = tempX[2]; + } + + else if (xType !='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempY = getCord(yCord); + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); + it++; + }); + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} + } + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + yCord = tempY[2]; + } + + else if (xType =='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempX = getCord(xCord); + tempY = getCord(yCord); + $.each(data,function(key,value) { + series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); + it++; + }); + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } + } + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + xCord = tempX[2]; + yCord = tempY[2]; + + } + + currentSettings.series = series; + currentChart = PMA_createChart(currentSettings); + scrollToChart(); + } +}); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index c806923591..d40cd7b30f 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -413,6 +413,7 @@ $goto_whitelist = array( 'tbl_replace.php', 'tbl_row_action.php', 'tbl_select.php', + 'tbl_zoom_select.php', //'themes.php', 'transformation_overview.php', 'transformation_wrapper.php', diff --git a/libraries/config.default.php b/libraries/config.default.php index efb0cbb358..d8367e5839 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1137,7 +1137,6 @@ $cfg['DefaultTabDatabase'] = 'db_structure.php'; */ $cfg['DefaultTabTable'] = 'sql.php'; - /******************************************************************************* * Export defaults */ @@ -1845,7 +1844,6 @@ $cfg['Export']['xml_export_contents'] = true; */ $cfg['Export']['yaml_structure_or_data'] = 'data'; - /******************************************************************************* * Import defaults */ @@ -2443,7 +2441,6 @@ $cfg['UserprefsDisallow'] = array(); */ $cfg['UserprefsDeveloperTab'] = false; - /******************************************************************************* * Window title settings */ @@ -2554,9 +2551,7 @@ $cfg['DefaultQueryDatabase'] = ''; /******************************************************************************* * SQL Query box settings * These are the links display in all of the SQL Query boxes - */ - -/** + * * @global array $cfg['SQLQuery'] */ $cfg['SQLQuery'] = array(); @@ -2628,7 +2623,7 @@ $cfg['SaveDir'] = ''; $cfg['TempDir'] = ''; -/******************************************************************************* +/** * Misc. settings */ @@ -2673,12 +2668,7 @@ $cfg['LinkLengthLimit'] = 1000; */ $cfg['DisableMultiTableMaintenance'] = false; - /******************************************************************************* - * SQL Parser - */ - -/** * SQL Parser Settings * * @global array $cfg['SQP'] @@ -2708,10 +2698,6 @@ $cfg['SQP']['fmtIndUnit'] = 'em'; /******************************************************************************* - * SQL Validator - */ - -/** * If you wish to use the SQL Validator service, you should be aware of the * following: * All SQL statements are stored anonymously for statistical purposes. @@ -2746,10 +2732,6 @@ $cfg['SQLValidator']['password'] = ''; /******************************************************************************* * Developers ONLY! - */ - -/** - * Debugging settings * * @global array $cfg['DBG'] */ @@ -2768,50 +2750,328 @@ $cfg['DBG']['sql'] = false; */ /** - * Column types - * - * Fill in this array to overwrite data from data_*.inc.php files + * Column types; + * VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity * * @global array $cfg['ColumnTypes'] */ -$cfg['ColumnTypes'] = array(); +$cfg['ColumnTypes'] = array( + // most used + 'INT', + 'VARCHAR', + 'TEXT', + 'DATE', + + // numeric + 'NUMERIC' => array( + 'TINYINT', + 'SMALLINT', + 'MEDIUMINT', + 'INT', + 'BIGINT', + '-', + 'DECIMAL', + 'FLOAT', + 'DOUBLE', + 'REAL', + '-', + 'BIT', + 'BOOLEAN', + 'SERIAL', + ), + + + // Date/Time + 'DATE and TIME' => array( + 'DATE', + 'DATETIME', + 'TIMESTAMP', + 'TIME', + 'YEAR', + ), + + // Text + 'STRING' => array( + 'CHAR', + 'VARCHAR', + '-', + 'TINYTEXT', + 'TEXT', + 'MEDIUMTEXT', + 'LONGTEXT', + '-', + 'BINARY', + 'VARBINARY', + '-', + 'TINYBLOB', + 'MEDIUMBLOB', + 'BLOB', + 'LONGBLOB', + '-', + 'ENUM', + 'SET', + ), + + 'SPATIAL' => array( + 'GEOMETRY', + 'POINT', + 'LINESTRING', + 'POLYGON', + 'MULTIPOINT', + 'MULTILINESTRING', + 'MULTIPOLYGON', + 'GEOMETRYCOLLECTION', + ), +); /** * Attributes * - * Fill in this array to overwrite data from data_*.inc.php files - * * @global array $cfg['AttributeTypes'] */ -$cfg['AttributeTypes'] = array(); +$cfg['AttributeTypes'] = array( + '', + 'BINARY', + 'UNSIGNED', + 'UNSIGNED ZEROFILL', + 'on update CURRENT_TIMESTAMP', +); + if ($cfg['ShowFunctionFields']) { /** * Available functions * - * Fill in this array to overwrite data from data_*.inc.php files - * * @global array $cfg['Functions'] */ - $cfg['Functions'] = array(); + $cfg['Functions'] = array( + 'ABS', + 'ACOS', + 'ASCII', + 'ASIN', + 'ATAN', + 'BIN', + 'BIT_COUNT', + 'BIT_LENGTH', + 'CEILING', + 'CHAR', + 'CHAR_LENGTH', + 'COMPRESS', + 'COS', + 'COT', + 'CRC32', + 'CURDATE', + 'CURRENT_USER', + 'CURTIME', + 'DATE', + 'DAYNAME', + 'DEGREES', + 'DES_DECRYPT', + 'DES_ENCRYPT', + 'ENCRYPT', + 'EXP', + 'FLOOR', + 'FROM_DAYS', + 'FROM_UNIXTIME', + 'HEX', + 'INET_ATON', + 'INET_NTOA', + 'LENGTH', + 'LN', + 'LOG', + 'LOG10', + 'LOG2', + 'LOWER', + 'MD5', + 'NOW', + 'OCT', + 'OLD_PASSWORD', + 'ORD', + 'PASSWORD', + 'RADIANS', + 'RAND', + 'REVERSE', + 'ROUND', + 'SEC_TO_TIME', + 'SHA1', + 'SOUNDEX', + 'SPACE', + 'SQRT', + 'STDDEV_POP', + 'STDDEV_SAMP', + 'TAN', + 'TIMESTAMP', + 'TIME_TO_SEC', + 'UNCOMPRESS', + 'UNHEX', + 'UNIX_TIMESTAMP', + 'UPPER', + 'USER', + 'UTC_DATE', + 'UTC_TIME', + 'UTC_TIMESTAMP', + 'UUID', + 'VAR_POP', + 'VAR_SAMP', + 'YEAR', + ); /** * Which column types will be mapped to which Group? * - * Fill in this array to overwrite data from data_*.inc.php files - * * @global array $cfg['RestrictColumnTypes'] */ - $cfg['RestrictColumnTypes'] = array(); + $cfg['RestrictColumnTypes'] = array( + 'TINYINT' => 'FUNC_NUMBER', + 'SMALLINT' => 'FUNC_NUMBER', + 'MEDIUMINT' => 'FUNC_NUMBER', + 'INT' => 'FUNC_NUMBER', + 'BIGINT' => 'FUNC_NUMBER', + 'DECIMAL' => 'FUNC_NUMBER', + 'FLOAT' => 'FUNC_NUMBER', + 'DOUBLE' => 'FUNC_NUMBER', + 'REAL' => 'FUNC_NUMBER', + 'BIT' => 'FUNC_NUMBER', + 'BOOLEAN' => 'FUNC_NUMBER', + 'SERIAL' => 'FUNC_NUMBER', + + 'DATE' => 'FUNC_DATE', + 'DATETIME' => 'FUNC_DATE', + 'TIMESTAMP' => 'FUNC_DATE', + 'TIME' => 'FUNC_DATE', + 'YEAR' => 'FUNC_DATE', + + 'CHAR' => 'FUNC_CHAR', + 'VARCHAR' => 'FUNC_CHAR', + 'TINYTEXT' => 'FUNC_CHAR', + 'TEXT' => 'FUNC_CHAR', + 'MEDIUMTEXT' => 'FUNC_CHAR', + 'LONGTEXT' => 'FUNC_CHAR', + 'BINARY' => 'FUNC_CHAR', + 'VARBINARY' => 'FUNC_CHAR', + 'TINYBLOB' => 'FUNC_CHAR', + 'MEDIUMBLOB' => 'FUNC_CHAR', + 'BLOB' => 'FUNC_CHAR', + 'LONGBLOB' => 'FUNC_CHAR', + 'ENUM' => '', + 'SET' => '', + + 'GEOMETRY' => 'FUNC_SPATIAL', + 'POINT' => 'FUNC_SPATIAL', + 'LINESTRING' => 'FUNC_SPATIAL', + 'POLYGON' => 'FUNC_SPATIAL', + 'MULTIPOINT' => 'FUNC_SPATIAL', + 'MULTILINESTRING' => 'FUNC_SPATIAL', + 'MULTIPOLYGON' => 'FUNC_SPATIAL', + 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', + + ); /** * Map above defined groups to any function * - * Fill in this array to overwrite data from data_*.inc.php files - * * @global array $cfg['RestrictFunctions'] */ - $cfg['RestrictFunctions'] = array(); + $cfg['RestrictFunctions'] = array( + 'FUNC_CHAR' => array( + 'BIN', + 'CHAR', + 'CURRENT_USER', + 'COMPRESS', + 'DAYNAME', + 'DES_DECRYPT', + 'DES_ENCRYPT', + 'ENCRYPT', + 'HEX', + 'INET_NTOA', + 'LOWER', + 'MD5', + 'OLD_PASSWORD', + 'PASSWORD', + 'REVERSE', + 'SHA1', + 'SOUNDEX', + 'SPACE', + 'UNCOMPRESS', + 'UNHEX', + 'UPPER', + 'USER', + 'UUID', + ), + + 'FUNC_DATE' => array( + 'CURDATE', + 'CURTIME', + 'DATE', + 'FROM_DAYS', + 'FROM_UNIXTIME', + 'NOW', + 'SEC_TO_TIME', + 'TIMESTAMP', + 'UTC_DATE', + 'UTC_TIME', + 'UTC_TIMESTAMP', + 'YEAR', + ), + + 'FUNC_NUMBER' => array( + 'ABS', + 'ACOS', + 'ASCII', + 'ASIN', + 'ATAN', + 'BIT_LENGTH', + 'BIT_COUNT', + 'CEILING', + 'CHAR_LENGTH', + 'COS', + 'COT', + 'CRC32', + 'DEGREES', + 'EXP', + 'FLOOR', + 'INET_ATON', + 'LENGTH', + 'LN', + 'LOG', + 'LOG2', + 'LOG10', + 'OCT', + 'ORD', + 'RADIANS', + 'RAND', + 'ROUND', + 'SQRT', + 'STDDEV_POP', + 'STDDEV_SAMP', + 'TAN', + 'TIME_TO_SEC', + 'UNIX_TIMESTAMP', + 'VAR_POP', + 'VAR_SAMP', + ), + + 'FUNC_SPATIAL' => array( + 'GeomFromText', + 'GeomFromWKB', + + 'GeomCollFromText', + 'LineFromText', + 'MLineFromText', + 'PointFromText', + 'MPointFromText', + 'PolyFromText', + 'MPolyFromText', + + 'GeomCollFromWKB', + 'LineFromWKB', + 'MLineFromWKB', + 'PointFromWKB', + 'MPointFromWKB', + 'PolyFromWKB', + 'MPolyFromWKB', + ), + ); /** * Default functions for above defined groups @@ -2825,6 +3085,97 @@ if ($cfg['ShowFunctionFields']) { 'first_timestamp' => 'NOW', 'pk_char36' => 'UUID', ); -} + + +} // end if + +/** + * Search operators + * + * @global array $cfg['NumOperators'] + */ +$cfg['NumOperators'] = array( + '=', + '>', + '>=', + '<', + '<=', + '!=', + 'LIKE', + 'NOT LIKE', + 'IN (...)', + 'NOT IN (...)', + 'BETWEEN', + 'NOT BETWEEN', +); + +/** + * Search operators + * + * @global array $cfg['TextOperators'] + */ +$cfg['TextOperators'] = array( + 'LIKE', + 'LIKE %...%', + 'NOT LIKE', + '=', + '!=', + 'REGEXP', + 'REGEXP ^...$', + 'NOT REGEXP', + "= ''", + "!= ''", + 'IN (...)', + 'NOT IN (...)', + 'BETWEEN', + 'NOT BETWEEN', +); + +/** + * Search operators + * + * @global array $cfg['EnumOperators'] + */ +$cfg['EnumOperators'] = array( + '=', + '!=', +); + +/** + * Search operators + * + * @global array $cfg['SetOperators'] + */ +$cfg['SetOperators'] = array( + 'IN', + 'NOT IN', +); + +/** + * Search operators + * + * @global array $cfg['NullOperators'] + */ +$cfg['NullOperators'] = array( + 'IS NULL', + 'IS NOT NULL', +); + +/** + * Search operators + * + * @global array $cfg['UnaryOperators'] + */ +$cfg['UnaryOperators'] = array( + 'IS NULL' => 1, + 'IS NOT NULL' => 1, + "= ''" => 1, + "!= ''" => 1 +); + +/** + * Max rows retreived for zoom search + */ +$cfg['maxRowPlotLimit'] = 500; ?> diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php new file mode 100644 index 0000000000..10c0aea343 --- /dev/null +++ b/libraries/svg_plot/pma_scatter_plot.php @@ -0,0 +1,267 @@ + array( + '#BCE02E', + '#E0642E', + '#E0D62E', + '#2E97E0', + '#B02EE0', + '#E02E75', + '#5CE02E', + '#E0B02E', + '#000000', + '#0022E0', + '#726CB1', + '#481A36', + '#BAC658', + '#127224', + '#825119', + '#238C74', + '#4C489B', + '#87C9BF', + ), + // Plot background color. + 'bgColor' => '#84AD83', + + // The width of the plot. + 'width' => 520, + + // The height of the plot. + 'height' => 325, + + // Default X Axis label. If empty, label will be taken from the data. + 'xLabel' => '', + + // Default Y Axis label. If empty, label will be taken from the data. + 'yLabel' => '', + + // Data point label. If empty, label will be taken from the data. + 'dataLabel' => '', + + ); + + /** + * @var array Options that the user has specified. + */ + private $_userSpecifiedSettings = null; + + /** + * Returns the settings array + * + * @return the settings array. + */ + public function getSettings() + { + return $this->_settings; + } + + /** + * Returns the data array + * + * @return the data array. + */ + public function getData() + { + return $this->_data; + } + + /** + * Constructor. Stores user specified options. + * + * @param array $data Data for the visualization + * @param array $options Users specified options + */ + public function __construct($data, $options) + { + $this->_userSpecifiedSettings = $options; + $this->_data = $data; + } + + /** + * All the variable initialization, options handling has to be done here. + */ + protected function init() + { + $this->_handleOptions(); + } + + /** + * A function which handles passed parameters. Useful if desired + * chart needs to be a little bit different from the default one. + */ + private function _handleOptions() + { + $this->_dataPoints = array(); + if (! is_null($this->_userSpecifiedSettings)) { + foreach (array_keys($this->_userSpecifiedSettings) as $key){ + $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; + } + } + if ($this->_settings['dataLabel'] == '') { + $labels = array_keys($this->_data[0]); + $this->_settings['dataLabel'] = $labels[0]; + } + } + + /** + * Generate the visualization in SVG format. + * + * @return the generated image resource + */ + private function _svg() + { + $this->init(); + + $output = '' . "\n"; + $output .= ''; + + return $output; + } + + /** + * Get the visualization as a SVG. + * + * @return the visualization as a SVG + */ + public function asSVG() + { + $output = $this->_svg(); + return $output; + } + + /** + * Calculates the scale, horizontal and vertical offset that should be used. + * + * @param array $data Row data + * + * @return an array containing the scale, x and y offsets + */ + private function _scaleDataSet($data,$xField,$yField) + { + + // Currently assuming only numeric fields are selected + $coordinates = array(); + foreach ($data as $row) { + $coordinates[0][] = $row[$xField]; + $coordinates[1][] = $row[$yField]; + } + for ($i = 0 ; $i < 2 ; $i++) { + + $maxC = ($i == 0) ? 500 : 320; + + if( !is_numeric($coordinates[$i][0])) { + $uniqueC = array_unique($coordinates[$i]); + $countC = count(array_unique($coordinates[$i])); + $map = $tmp = array(); + foreach ($uniqueC as $uc) { + $tmp[] = $uc; + } + for ($j = 0 ; $j < $countC ; $j++) { + $map[$tmp[$j]] = 20 + $j * $maxC / $countC; + } + for($j = 0 ; $j < count($coordinates[$i]) ; $j++) { + $coordinates[$i][$j] = $map[$coordinates[$i][$j]]; + } + + } + elseif (is_numeric($coordinates[$i][0])) { + + $maxC = max($coordinates[$i]); + for($j = 0 ; $j < count($coordinates[$i]) ; $j++) { + + if ($i == 0) + $coordinates[$i][$j] = 20 + 500 * $coordinates[$i][$j] / $maxC; + else + $coordinates[$i][$j] = 20 + 320 * (1 - $coordinates[$i][$j] / $maxC); + } + } + } + return $coordinates; + } + + /** + * Prepares and return the dataset as needed by the visualization. + * + * @param array $data Raw data + * @param int $color_number Start index to the color array + * @param array $scale_data Data related to scaling + * @param string $label Label for the data points + * @param image $results Image object in the case of png + * + * @return the formatted array of data. + */ + private function _prepareDataSet($data, $color_number, $scale_data, $label) + { + $result = ''; + // loop through the rows + for($i = 0 ; $i < count($data) ; $i++) { + + $index = $color_number % sizeof($this->_settings['colors']); + + $data_element = new PMA_SVG_Data_Point($scale_data[0][$i],$scale_data[1][$i],$data[$i][$label],$data[$i]); + + $options = array('color' => $this->_settings['colors'][$index], 'id' => $i); + $this->_dataPoints[] = $data_element; + + $result .= $data_element->prepareRowAsSVG($options); + $color_number++; + } + + + return $result; + } +} +?> + diff --git a/libraries/svg_plot/pma_svg_data_element.php b/libraries/svg_plot/pma_svg_data_element.php new file mode 100644 index 0000000000..97f7734572 --- /dev/null +++ b/libraries/svg_plot/pma_svg_data_element.php @@ -0,0 +1,50 @@ +label = $label; + $this->dataRow = $dataRow; + } + + /** + * Handles the generation of each Data Row/Element as a SVG element + * @return the code related to a row in the GIS dataset + */ + public abstract function prepareRowAsSVG($options); + + public function getLabel() + { + return $this->label; + } + + public function setLabel($label) + { + $this->label = $label; + } + + public function getDataRow() + { + return $this->dataRow; + } + + public function setDataRow($dataRow) + { + $this->dataRow = $dataRow; + } +} +?> diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php new file mode 100644 index 0000000000..7d01b2b566 --- /dev/null +++ b/libraries/svg_plot/pma_svg_data_point.php @@ -0,0 +1,86 @@ +cx = $cx; + $this->cy = $cy; + + } + + public function prepareRowAsSVG($options) + { + return $this->prepareSvg($options); + } + + /** + * Prepares and returns the code related to a row in the query result as SVG. + * + * @param array $options Array containing options related to properties of the point + * + * @return the code related to a row in the query result. + */ + + protected function prepareSvg($options) + { + $point_options = array( + 'name' => $this->label . '_' .$options['id'], + 'id' => $this->label . 'id' . '_' . $options['id'], + 'class' => 'point', + 'fill' => 'white', + 'stroke' => $options['color'], + 'stroke-width'=> 2, + ); + + $row = '
';
- if ($GLOBALS['cfg']['PropertiesIconic'] === 'both') {
- $titles['Browse'] .= __('Browse foreign values');
- }
-} else {
- $titles['Browse'] = __('Browse foreign values');
-}
+$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage);
/**
* Not selection yet required -> displays the selection form
@@ -61,45 +52,26 @@ if (! isset($param) || $param[0] == '') {
$err_url = $goto . '?' . PMA_generate_common_url($db, $table);
// Gets the list and number of fields
- $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
- $fields_cnt = PMA_DBI_num_rows($result);
- $fields_list = $fields_null = $fields_type = $fields_collation = array();
- while ($row = PMA_DBI_fetch_assoc($result)) {
- $fields_list[] = $row['Field'];
- $type = $row['Type'];
- // reformat mysql query output
- if (strncasecmp($type, 'set', 3) == 0
- || strncasecmp($type, 'enum', 4) == 0) {
- $type = str_replace(',', ', ', $type);
- } else {
- // strip the "BINARY" attribute, except if we find "BINARY(" because
- // this would be a BINARY or VARBINARY field type
- if (!preg_match('@BINARY[\(]@i', $type)) {
- $type = preg_replace('@BINARY@i', '', $type);
- }
- $type = preg_replace('@ZEROFILL@i', '', $type);
- $type = preg_replace('@UNSIGNED@i', '', $type);
-
- $type = strtolower($type);
- }
- if (empty($type)) {
- $type = ' ';
- }
- $fields_null[] = $row['Null'];
- $fields_type[] = $type;
- $fields_collation[] = !empty($row['Collation']) && $row['Collation'] != 'NULL'
- ? $row['Collation']
- : '';
- } // end while
- PMA_DBI_free_result($result);
- unset($result, $type);
+ list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db);
+ $fields_cnt = count($fields_list);
// retrieve keys into foreign fields, if any
// check also foreigners even if relwork is FALSE (to get
// foreign keys from innodb)
$foreigners = PMA_getForeigners($db, $table);
?>
+
+