From: Karsten Dambekalns <karsten.dambekalns@typo3.org>
Date: Wed, 30 May 2007 14:17:49 +0000 (+0000)
Subject: Added default values and some usability improvements to cached info display in debug... 
X-Git-Tag: TYPO3_4-2-0alpha1~84
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/923f2480420f2f50fd0638e7bab009ccbc4ea4c8

Added default values and some usability improvements to cached info display in debug module (closes bug #3750)

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2353 709f56b5-9817-0410-a4d7-c38de5d9e867
---

diff --git a/typo3/sysext/dbal/ChangeLog b/typo3/sysext/dbal/ChangeLog
index eadb4a9d5ee..903b25cab13 100644
--- a/typo3/sysext/dbal/ChangeLog
+++ b/typo3/sysext/dbal/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-30  Karsten Dambekalns <karsten@typo3.org>
+
+	* Added default values and some usability improvements to cached info display in debug module (closes bug #3750)
+
 2007-05-29  Karsten Dambekalns <karsten@typo3.org>
 
 	* Closes bug #4462: creates tables without OIDs on PostgreSQL now
diff --git a/typo3/sysext/dbal/mod1/index.php b/typo3/sysext/dbal/mod1/index.php
index d641a11ff9c..0df1bda643c 100644
--- a/typo3/sysext/dbal/mod1/index.php
+++ b/typo3/sysext/dbal/mod1/index.php
@@ -303,7 +303,8 @@ updateQryForm(\''.$input['QUERY'].'\');
 			$GLOBALS['TYPO3_DB']->cacheFieldInfo();
 		}
 
-		$out = '<table border="1" cellspacing="0"><caption>auto_increment</caption><tbody><tr><th>Table</th><th>Field</th></tr>';
+		$out = '<a name="autoincrement"></a><h2>auto_increment</h2>';
+		$out .= '<table border="1" cellspacing="0"><tbody><tr><th>Table</th><th>Field</th></tr>';
 		ksort($GLOBALS['TYPO3_DB']->cache_autoIncFields);
 		foreach($GLOBALS['TYPO3_DB']->cache_autoIncFields as $table => $field) {
 			$out .= '<tr>';
@@ -312,8 +313,10 @@ updateQryForm(\''.$input['QUERY'].'\');
 			$out .= '</tr>';
 		}
 		$out .= '</tbody></table>';
+
 		$out .= $this->doc->spacer(5);
-		$out .= '<table border="1" cellspacing="0"><caption>Primary keys</caption><tbody><tr><th>Table</th><th>Field(s)</th></tr>';
+		$out .= '<a name="primarykeys"></a><h2>Primary keys</h2>';
+		$out .= '<table border="1" cellspacing="0"><tbody><tr><th>Table</th><th>Field(s)</th></tr>';
 		ksort($GLOBALS['TYPO3_DB']->cache_primaryKeys);
 		foreach($GLOBALS['TYPO3_DB']->cache_primaryKeys as $table => $field) {
 			$out .= '<tr>';
@@ -322,23 +325,50 @@ updateQryForm(\''.$input['QUERY'].'\');
 			$out .= '</tr>';
 		}
 		$out .= '</tbody></table>';
+
 		$out .= $this->doc->spacer(5);
-		$out .= '<table border="1" cellspacing="0"><caption>Field types</caption><tbody><tr><th colspan="4">Table</th></tr><tr><th>Field</th><th>Type</th><th>Metatype</th><th>NOT NULL</th></th></tr>';
+		$out .= '<a name="fieldtypes"></a><h2>Field types</h2>';
+		$out .= '<table border="1" cellspacing="0"><tbody><tr><th colspan="5">Table</th></tr><tr><th>Field</th><th>Type</th><th><a href="#metatypes">Metatype</a></th><th>NOT NULL</th><th>Default</th></th></tr>';
 		ksort($GLOBALS['TYPO3_DB']->cache_fieldType);
 		foreach($GLOBALS['TYPO3_DB']->cache_fieldType as $table => $fields) {
-			$out .= '<th colspan="4">'.$table.'</th>';
+			$out .= '<th colspan="5">'.$table.'</th>';
 			foreach($fields as $field => $data) {
 				$out .= '<tr>';
 				$out .= '<td>'.$field.'</td>';
 				$out .= '<td>'.$data['type'].'</td>';
 				$out .= '<td>'.$data['metaType'].'</td>';
-				$out .= '<td>'.$data['notnull'].'</td>';
+				$out .= '<td>'.($data['notnull']?'NOT NULL':'').'</td>';
+				$out .= '<td>'.$data['default'].'</td>';
 				$out .= '</tr>';
 			}
 		}
 		$out .= '</tbody></table>';
 
+		$out .= $this->doc->spacer(5);
+		$out .= '<a name="metatypes"></a><h2>Metatype explanation</h2>';
+		$out .= '<pre>
+  C:  Varchar, capped to 255 characters.
+  X:  Larger varchar, capped to 4000 characters (to be compatible with Oracle). 
+  XL: For Oracle, returns CLOB, otherwise the largest varchar size.
+
+  C2: Multibyte varchar
+  X2: Multibyte varchar (largest size)
+
+  B:  BLOB (binary large object)
+
+  D:  Date (some databases do not support this, and we return a datetime type)
+  T:  Datetime or Timestamp
+  L:  Integer field suitable for storing booleans (0 or 1)
+  I:  Integer (mapped to I4)
+  I1: 1-byte integer
+  I2: 2-byte integer
+  I4: 4-byte integer
+  I8: 8-byte integer
+  F:  Floating point number
+  N:  Numeric or decimal number</pre>';
+
 		$menu = '<a href="index.php?cmd=clear">CLEAR DATA</a><hr />';
+		$menu .= '<a href="#autoincrement">auto_increment</a> | <a href="#primarykeys">Primary keys</a> | <a href="#fieldtypes">Field types</a> | <a href="#metatypes">Metatype explanation</a><hr />';
 
 		return $menu.$out;
 	}