nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added spatial functions for 'insert new row' function select box;

Browse Source 
updated all other functions in list;
This commit is contained in:
Sebastian Mendel
2007-12-13 16:42:27 +00:00
parent b1939a554a
commit 45fb839b19
1 changed files with 204 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

262
libraries/config.default.php
View File

@@ -2298,12 +2298,12 @@ $cfg['ColumnTypes'] = array(
'MEDIUMINT', 'MEDIUMINT',
'INT', 'INT',
'BIGINT', 'BIGINT',
'', '-',
'DECIMAL', 'DECIMAL',
'FLOAT', 'FLOAT',
'DOUBLE', 'DOUBLE',
'REAL', 'REAL',
'', '-',
'BIT', 'BIT',
'BOOL', 'BOOL',
'SERIAL', 'SERIAL',
@@ -2323,24 +2323,20 @@ $cfg['ColumnTypes'] = array(
'STRING' => array( 'STRING' => array(
'CHAR', 'CHAR',
'VARCHAR', 'VARCHAR',
'', '-',
'TINYTEXT', 'TINYTEXT',
'TEXT', 'TEXT',
'MEDIUMTEXT', 'MEDIUMTEXT',
'LONGTEXT', 'LONGTEXT',
'', '-',
'BINARY', 'BINARY',
'VARBINARY', 'VARBINARY',
'', '-',
'TINYBLOB', 'TINYBLOB',
'MEDIUMBLOB', 'MEDIUMBLOB',
'BLOB', 'BLOB',
'LONGBLOB', 'LONGBLOB',
'', '-',
'ENUM', 'ENUM',
'SET', 'SET',
), ),
@@ -2368,7 +2364,7 @@ $cfg['AttributeTypes'] = array(
'', '',
'BINARY', 'BINARY',
'UNSIGNED', 'UNSIGNED',
'UNSIGNED ZEROFILL' 'UNSIGNED ZEROFILL',
); );
@@ -2379,40 +2375,75 @@ if ($cfg['ShowFunctionFields']) {
* @global array $cfg['Functions'] * @global array $cfg['Functions']
*/ */
$cfg['Functions'] = array( $cfg['Functions'] = array(
'ABS',
'ACOS',
'ASCII', 'ASCII',
'ASIN',
'ATAN',
'BIN',
'BIT_COUNT',
'BIT_LENGTH',
'CEILING',
'CHAR', 'CHAR',
'SOUNDEX', 'CHAR_LENGTH',
'LCASE',
'UCASE',
'NOW',
'PASSWORD',
'OLD_PASSWORD',
'MD5',
'SHA1',
'ENCRYPT',
'COMPRESS', 'COMPRESS',
'UNCOMPRESS', 'COS',
'RAND', 'COT',
'LAST_INSERT_ID', 'CRC32',
'COUNT',
'AVG',
'SUM',
'CURDATE', 'CURDATE',
'CURRENT_USER',
'CURTIME', '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_DATE',
'UTC_TIME', 'UTC_TIME',
'UTC_TIMESTAMP', 'UTC_TIMESTAMP',
'FROM_DAYS', 'UUID',
'FROM_UNIXTIME', 'VAR_POP',
'PERIOD_ADD', 'VAR_SAMP',
'PERIOD_DIFF', 'YEAR',
'TO_DAYS',
'UNIX_TIMESTAMP',
'USER',
'WEEKDAY',
'CONCAT',
'HEX',
'UNHEX'
); );
/** /**
@@ -2421,31 +2452,49 @@ if ($cfg['ShowFunctionFields']) {
* @global array $cfg['RestrictColumnTypes'] * @global array $cfg['RestrictColumnTypes']
*/ */
$cfg['RestrictColumnTypes'] = array( $cfg['RestrictColumnTypes'] = array(
'VARCHAR' => 'FUNC_CHAR',
'TINYINT' => 'FUNC_NUMBER', 'TINYINT' => 'FUNC_NUMBER',
'TEXT' => 'FUNC_CHAR',
'DATE' => 'FUNC_DATE',
'SMALLINT' => 'FUNC_NUMBER', 'SMALLINT' => 'FUNC_NUMBER',
'MEDIUMINT' => 'FUNC_NUMBER', 'MEDIUMINT' => 'FUNC_NUMBER',
'INT' => 'FUNC_NUMBER', 'INT' => 'FUNC_NUMBER',
'BIGINT' => 'FUNC_NUMBER', 'BIGINT' => 'FUNC_NUMBER',
'DECIMAL' => 'FUNC_NUMBER',
'FLOAT' => 'FUNC_NUMBER', 'FLOAT' => 'FUNC_NUMBER',
'DOUBLE' => 'FUNC_NUMBER', 'DOUBLE' => 'FUNC_NUMBER',
'DECIMAL' => 'FUNC_NUMBER', 'REAL' => 'FUNC_NUMBER',
'BIT' => 'FUNC_NUMBER',
'BOOL' => 'FUNC_NUMBER',
'SERIAL' => 'FUNC_NUMBER',
'DATE' => 'FUNC_DATE',
'DATETIME' => 'FUNC_DATE', 'DATETIME' => 'FUNC_DATE',
'TIMESTAMP' => 'FUNC_DATE', 'TIMESTAMP' => 'FUNC_DATE',
'TIME' => 'FUNC_DATE', 'TIME' => 'FUNC_DATE',
'YEAR' => 'FUNC_DATE', 'YEAR' => 'FUNC_DATE',
'CHAR' => 'FUNC_CHAR', 'CHAR' => 'FUNC_CHAR',
'TINYBLOB' => 'FUNC_CHAR', 'VARCHAR' => 'FUNC_CHAR',
'TINYTEXT' => 'FUNC_CHAR', 'TINYTEXT' => 'FUNC_CHAR',
'BLOB' => 'FUNC_CHAR', 'TEXT' => 'FUNC_CHAR',
'MEDIUMBLOB' => 'FUNC_CHAR',
'MEDIUMTEXT' => 'FUNC_CHAR', 'MEDIUMTEXT' => 'FUNC_CHAR',
'LONGBLOB' => 'FUNC_CHAR',
'LONGTEXT' => 'FUNC_CHAR', 'LONGTEXT' => 'FUNC_CHAR',
'BINARY' => 'FUNC_CHAR',
'VARBINARY' => 'FUNC_CHAR',
'TINYBLOB' => 'FUNC_CHAR',
'MEDIUMBLOB' => 'FUNC_CHAR',
'BLOB' => 'FUNC_CHAR',
'LONGBLOB' => 'FUNC_CHAR',
'ENUM' => '', 'ENUM' => '',
'SET' => '' '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',
); );
/** /**
@@ -2455,54 +2504,103 @@ if ($cfg['ShowFunctionFields']) {
*/ */
$cfg['RestrictFunctions'] = array( $cfg['RestrictFunctions'] = array(
'FUNC_CHAR' => array( 'FUNC_CHAR' => array(
'ASCII', 'BIN',
'CHAR', 'CHAR',
'SOUNDEX', 'CURRENT_USER',
'LCASE',
'UCASE',
'PASSWORD',
'OLD_PASSWORD',
'MD5',
'SHA1',
'ENCRYPT',
'COMPRESS', 'COMPRESS',
'UNCOMPRESS', 'DAYNAME',
'LAST_INSERT_ID', 'DES_DECRYPT',
'USER', 'DES_ENCRYPT',
'CONCAT', 'ENCRYPT',
'HEX', 'HEX',
'UNHEX' 'INET_NTOA',
'LOWER',
'MD5',
'OLD_PASSWORD',
'PASSWORD',
'REVERSE',
'SHA1',
'SOUNDEX',
'SPACE',
'UNCOMPRESS',
'UNHEX',
'UPPER',
'USER',
'UUID',
), ),
'FUNC_DATE' => array( 'FUNC_DATE' => array(
'NOW',
'CURDATE', 'CURDATE',
'CURTIME', 'CURTIME',
'DATE',
'FROM_DAYS', 'FROM_DAYS',
'FROM_UNIXTIME', 'FROM_UNIXTIME',
'PERIOD_ADD', 'NOW',
'PERIOD_DIFF', 'SEC_TO_TIME',
'TO_DAYS', 'TIMESTAMP',
'UNIX_TIMESTAMP',
'UTC_DATE', 'UTC_DATE',
'UTC_TIME', 'UTC_TIME',
'UTC_TIMESTAMP', 'UTC_TIMESTAMP',
'WEEKDAY' 'YEAR',
), ),
'FUNC_NUMBER' => array( 'FUNC_NUMBER' => array(
'ABS',
'ACOS',
'ASCII', 'ASCII',
'CHAR', 'ASIN',
'MD5', 'ATAN',
'SHA1', 'BIT_LENGTH',
'ENCRYPT', 'BIT_COUNT',
'CEILING',
'CHAR_LENGTH',
'COS',
'COT',
'CRC32',
'DEGREES',
'EXP',
'FLOOR',
'INET_ATON',
'LENGTH',
'LN',
'LOG',
'LOG2',
'LOG10',
'OCT',
'ORD',
'RADIANS',
'RAND', 'RAND',
'LAST_INSERT_ID', 'ROUND',
'SQRT',
'STDDEV_POP',
'STDDEV_SAMP',
'TAN',
'TIME_TO_SEC',
'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP',
'COUNT', 'VAR_POP',
'AVG', 'VAR_SAMP',
'SUM' ),
)
'FUNC_SPATIAL' => array(
'GeomFromText',
'GeomFromWKB',
'GeomCollFromText',
'LineFromText',
'MLineFromText',
'PointFromText',
'MPointFromText',
'PolyFromText',
'MPolyFromText',
'GeomCollFromWKB',
'LineFromWKB',
'MLineFromWKB',
'PointFromWKB',
'MPointFromWKB',
'PolyFromWKB',
'MPolyFromWKB',
),
); );
/** /**
@@ -2514,7 +2612,7 @@ if ($cfg['ShowFunctionFields']) {
'FUNC_CHAR' => '', 'FUNC_CHAR' => '',
'FUNC_DATE' => '', 'FUNC_DATE' => '',
'FUNC_NUMBER' => '', 'FUNC_NUMBER' => '',
'first_timestamp' => 'NOW' 'first_timestamp' => 'NOW',
); );
@@ -2533,7 +2631,7 @@ $cfg['NumOperators'] = array(
'<=', '<=',
'!=', '!=',
'LIKE', 'LIKE',
'NOT LIKE' 'NOT LIKE',
); );
/** /**
@@ -2548,7 +2646,7 @@ $cfg['TextOperators'] = array(
'=', '=',
'!=', '!=',
'REGEXP', 'REGEXP',
'NOT REGEXP' 'NOT REGEXP',
); );
/** /**
@@ -2558,7 +2656,7 @@ $cfg['TextOperators'] = array(
*/ */
$cfg['EnumOperators'] = array( $cfg['EnumOperators'] = array(
'=', '=',
'!=' '!=',
); );
/** /**
@@ -2568,7 +2666,7 @@ $cfg['EnumOperators'] = array(
*/ */
$cfg['SetOperators'] = array( $cfg['SetOperators'] = array(
'IN', 'IN',
'NOT IN' 'NOT IN',
); );
/** /**
@@ -2578,7 +2676,7 @@ $cfg['SetOperators'] = array(
*/ */
$cfg['NullOperators'] = array( $cfg['NullOperators'] = array(
'IS NULL', 'IS NULL',
'IS NOT NULL' 'IS NOT NULL',
); );
/** /**
@@ -2588,7 +2686,7 @@ $cfg['NullOperators'] = array(
*/ */
$cfg['UnaryOperators'] = array( $cfg['UnaryOperators'] = array(
'IS NULL' => 1, 'IS NULL' => 1,
'IS NOT NULL' => 1 'IS NOT NULL' => 1,
); );
?> ?>