Thread: [adminer-svn] SF.net SVN: adminer:[981] trunk/adminer/include/export.inc.php
Database management in a single PHP file
Brought to you by:
jakubvrana
From: <jak...@us...> - 2009-08-19 15:51:06
|
Revision: 981 http://adminer.svn.sourceforge.net/adminer/?rev=981&view=rev Author: jakubvrana Date: 2009-08-19 15:50:58 +0000 (Wed, 19 Aug 2009) Log Message: ----------- No space at end of line Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-08-19 14:11:58 UTC (rev 980) +++ trunk/adminer/include/export.inc.php 2009-08-19 15:50:58 UTC (rev 981) @@ -128,9 +128,9 @@ echo $insert . $s; $length = strlen($insert) + strlen($s); } else { - $length += 2 + strlen($s); // 2 - separator length + $length += 1 + strlen($s); // 1 - separator length if ($length < $max_packet) { - echo ", $s"; + echo ",$s"; } else { echo ";\n$insert$s"; $length = strlen($insert) + strlen($s); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-08-25 13:56:17
|
Revision: 1008 http://adminer.svn.sourceforge.net/adminer/?rev=1008&view=rev Author: jakubvrana Date: 2009-08-25 13:56:05 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Introducer _binary is not needed Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-08-25 12:21:03 UTC (rev 1007) +++ trunk/adminer/include/export.inc.php 2009-08-25 13:56:05 UTC (rev 1008) @@ -102,7 +102,7 @@ if ($_POST["format"] != "csv" && $style == "TRUNCATE+INSERT") { echo "TRUNCATE " . idf_escape($table) . ";\n"; } - $result = $dbh->query(($select ? $select : "SELECT * FROM " . idf_escape($table))); //! enum and set as numbers, binary as _binary, microtime + $result = $dbh->query(($select ? $select : "SELECT * FROM " . idf_escape($table))); //! enum and set as numbers, microtime if ($result) { $fields = fields($table); $length = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-08-25 15:23:51
|
Revision: 1013 http://adminer.svn.sourceforge.net/adminer/?rev=1013&view=rev Author: jakubvrana Date: 2009-08-25 15:23:44 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Typo Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-08-25 15:23:19 UTC (rev 1012) +++ trunk/adminer/include/export.inc.php 2009-08-25 15:23:44 UTC (rev 1013) @@ -158,5 +158,5 @@ } $dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>" - . " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>" + . " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>"; $max_packet = 1048576; // default, minimum is 1024 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-08-28 16:28:59
|
Revision: 1040 http://adminer.svn.sourceforge.net/adminer/?rev=1040&view=rev Author: jakubvrana Date: 2009-08-28 16:28:39 +0000 (Fri, 28 Aug 2009) Log Message: ----------- Memory leaked by gzencode Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-08-28 15:47:05 UTC (rev 1039) +++ trunk/adminer/include/export.inc.php 2009-08-28 16:28:39 UTC (rev 1040) @@ -1,6 +1,4 @@ <?php -//! memory consumption - function dump_table($table, $style, $is_view = false) { global $dbh; if ($_POST["format"] == "csv") { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-09-11 18:53:52
|
Revision: 1094 http://adminer.svn.sourceforge.net/adminer/?rev=1094&view=rev Author: jakubvrana Date: 2009-09-11 18:53:39 +0000 (Fri, 11 Sep 2009) Log Message: ----------- No query after unbuffered Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-09-11 18:47:35 UTC (rev 1093) +++ trunk/adminer/include/export.inc.php 2009-09-11 18:53:39 UTC (rev 1094) @@ -120,9 +120,9 @@ if ($_POST["format"] != "csv" && $style == "TRUNCATE+INSERT") { dump("TRUNCATE " . idf_escape($table) . ";\n"); } + $fields = fields($table); $result = $dbh->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers, microtime if ($result) { - $fields = fields($table); $insert = ""; $buffer = ""; while ($row = $result->fetch_assoc()) { @@ -132,14 +132,13 @@ if (!$insert) { $insert = "INSERT INTO " . idf_escape($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES"; } - $row2 = array(); foreach ($row as $key => $val) { - $row2[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : $dbh->quote($val)) : "NULL"); //! columns looking like functions + $row[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : $dbh->quote($val)) : "NULL"); //! columns looking like functions } - $s = implode(",\t", $row2); + $s = implode(",\t", $row); if ($style == "INSERT+UPDATE") { $set = array(); - foreach ($row2 as $key => $val) { + foreach ($row as $key => $val) { $set[] = idf_escape($key) . " = $val"; } dump("$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-09-23 10:05:20
|
Revision: 1132 http://adminer.svn.sourceforge.net/adminer/?rev=1132&view=rev Author: jakubvrana Date: 2009-09-23 10:05:06 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Missing escaping (bug #2864585) Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-09-23 09:56:07 UTC (rev 1131) +++ trunk/adminer/include/export.inc.php 2009-09-23 10:05:06 UTC (rev 1132) @@ -85,7 +85,7 @@ dump(" WHEN " . $connection->quote($row["COLUMN_NAME"]) . " THEN SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', ''); - IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != '$row[COLUMN_TYPE]' OR _extra != '$row[EXTRA]' OR _column_comment != " . $connection->quote($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN + IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . $connection->quote($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . $connection->quote($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]'); END IF;"); //! don't replace in comment } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-09-24 14:16:56
|
Revision: 1141 http://adminer.svn.sourceforge.net/adminer/?rev=1141&view=rev Author: jakubvrana Date: 2009-09-24 14:16:47 +0000 (Thu, 24 Sep 2009) Log Message: ----------- Include terminator Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-09-24 11:05:34 UTC (rev 1140) +++ trunk/adminer/include/export.inc.php 2009-09-24 14:16:47 UTC (rev 1141) @@ -146,7 +146,7 @@ $s = "\n($s)"; if (!$buffer) { $buffer = $insert . $s; - } elseif (strlen($buffer) + 1 + strlen($s) < $max_packet) { // 1 - separator length + } elseif (strlen($buffer) + 2 + strlen($s) < $max_packet) { // 2 - separator and terminator length $buffer .= ",$s"; } else { $buffer .= ";\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-10-10 21:33:35
|
Revision: 1182 http://adminer.svn.sourceforge.net/adminer/?rev=1182&view=rev Author: jakubvrana Date: 2009-10-10 21:33:22 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Fix ALTER export Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-10-10 17:03:19 UTC (rev 1181) +++ trunk/adminer/include/export.inc.php 2009-10-10 21:33:22 UTC (rev 1182) @@ -56,12 +56,13 @@ $result = $connection->query($query); $after = ""; while ($row = $result->fetch_assoc()) { - $row["default"] = (isset($row["COLUMN_DEFAULT"]) ? $connection->quote($row["COLUMN_DEFAULT"]) : "NULL"); + $default = $row["COLUMN_DEFAULT"]; + $row["default"] = (isset($default) ? ($default == "CURRENT_TIMESTAMP" ? $default : $connection->quote($default)) : "NULL"); $row["after"] = $connection->quote($after); //! rgt AFTER lft, lft AFTER id doesn't work $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"]) . " $row[COLUMN_TYPE]" . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "") - . (isset($row["COLUMN_DEFAULT"]) ? " DEFAULT $row[default]" : "") + . (isset($default) ? " DEFAULT $row[default]" : "") . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL") . ($row["EXTRA"] ? " $row[EXTRA]" : "") . ($row["COLUMN_COMMENT"] ? " COMMENT " . $connection->quote($row["COLUMN_COMMENT"]) : "") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jak...@us...> - 2009-10-13 13:05:18
|
Revision: 1186 http://adminer.svn.sourceforge.net/adminer/?rev=1186&view=rev Author: jakubvrana Date: 2009-10-13 13:05:10 +0000 (Tue, 13 Oct 2009) Log Message: ----------- Alter export edge cases Modified Paths: -------------- trunk/adminer/include/export.inc.php Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-10-13 12:47:53 UTC (rev 1185) +++ trunk/adminer/include/export.inc.php 2009-10-13 13:05:10 UTC (rev 1186) @@ -45,10 +45,10 @@ $query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . $connection->quote($table) . " ORDER BY ORDINAL_POSITION"; echo "DELIMITER ;; CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN - DECLARE _column_name, _collation_name, _column_type, after varchar(64) DEFAULT ''; - DECLARE _column_default longtext; + DECLARE _column_name, _collation_name, after varchar(64) DEFAULT ''; + DECLARE _column_type, _column_default text; DECLARE _is_nullable char(3); - DECLARE _extra varchar(20); + DECLARE _extra varchar(30); DECLARE _column_comment varchar(255); DECLARE done, set_after bool DEFAULT 0; DECLARE add_columns text DEFAULT '"; @@ -57,12 +57,12 @@ $after = ""; while ($row = $result->fetch_assoc()) { $default = $row["COLUMN_DEFAULT"]; - $row["default"] = (isset($default) ? ($default == "CURRENT_TIMESTAMP" ? $default : $connection->quote($default)) : "NULL"); + $row["default"] = (isset($default) ? $connection->quote($default) : "NULL"); $row["after"] = $connection->quote($after); //! rgt AFTER lft, lft AFTER id doesn't work $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"]) . " $row[COLUMN_TYPE]" . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "") - . (isset($default) ? " DEFAULT $row[default]" : "") + . (isset($default) ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "") . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL") . ($row["EXTRA"] ? " $row[EXTRA]" : "") . ($row["COLUMN_COMMENT"] ? " COMMENT " . $connection->quote($row["COLUMN_COMMENT"]) : "") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |