]>
Commit | Line | Data |
---|---|---|
285c2027 PG |
1 | --- ./MDB-0.9.8/MDB_pear_wrapper_test.php.org Thu Jul 4 23:06:59 2002 |
2 | +++ ./MDB-0.9.8/MDB_pear_wrapper_test.php Thu Jul 4 23:20:11 2002 | |
3 | @@ -4,8 +4,8 @@ | |
4 | // MDB test script for the PEAR DB Wrapper. | |
5 | // | |
6 | ||
7 | - require_once("pear_wrapper.php"); | |
8 | - require_once("Var_Dump.php"); | |
9 | + require_once("MDB/pear_wrapper.php"); | |
10 | + require_once("MDB/MDB_Var_Dump.php"); | |
11 | ||
12 | // just for kicks you can mess up this part to see some pear error handling | |
13 | $user = 'metapear'; | |
14 | @@ -23,7 +23,7 @@ | |
15 | $db = DB::connect($dsn); | |
16 | // With DB::isError you can differentiate between an error or | |
17 | // a valid connection. | |
18 | - //echo Var_Dump::display($db)."<br>"; | |
19 | + //echo MDB_Var_Dump::display($db)."<br>"; | |
20 | if (DB::isError($db)) { | |
21 | die ($db->getMessage()); | |
22 | } | |
23 | @@ -36,22 +36,22 @@ | |
24 | // run the query and get a result handler | |
25 | $result = $db->simpleQuery($query); | |
26 | echo "<br>tableInfo() "; | |
27 | - Var_Dump::display($db->tableInfo($result)); | |
28 | + MDB_Var_Dump::display($db->tableInfo($result)); | |
29 | ||
30 | $result = $db->query($query); | |
31 | echo "<br>numCols() "; | |
32 | - Var_Dump::display($result->numCols()); | |
33 | + MDB_Var_Dump::display($result->numCols()); | |
34 | $result->fetchInto(&$arr); | |
35 | echo "<br>fetchInto() "; | |
36 | - Var_Dump::display($arr); | |
37 | + MDB_Var_Dump::display($arr); | |
38 | echo "<br>free() "; | |
39 | - Var_Dump::display($result->free()); | |
40 | + MDB_Var_Dump::display($result->free()); | |
41 | ||
42 | $result = $db->query($query); | |
43 | echo "<br>numRows() "; | |
44 | - Var_Dump::display($result->numRows()); | |
45 | + MDB_Var_Dump::display($result->numRows()); | |
46 | echo "<br>fetchRow() "; | |
47 | - Var_Dump::display($result->fetchRow()); | |
48 | + MDB_Var_Dump::display($result->fetchRow()); | |
49 | ||
50 | // lets create a sequence on demand | |
51 | echo "<br>get the next id using on demand:<br>"; | |
52 | @@ -91,16 +91,16 @@ | |
53 | echo "<br>see getOne in action:<br>".$db->getOne("SELECT trans_en FROM numbers WHERE number = ?",$array)."<br>"; | |
54 | // You can disconnect from the database with: | |
55 | echo "<br>see getRow in action:<br>"; | |
56 | - echo Var_Dump::display($db->getRow("SELECT * FROM numbers WHERE number = ?",$array))."<br>"; | |
57 | + echo MDB_Var_Dump::display($db->getRow("SELECT * FROM numbers WHERE number = ?",$array))."<br>"; | |
58 | echo "<br>see getCol in action:<br>"; | |
59 | - echo Var_Dump::display($db->getCol("SELECT * FROM numbers", 1))."<br>"; | |
60 | + echo MDB_Var_Dump::display($db->getCol("SELECT * FROM numbers", 1))."<br>"; | |
61 | echo "<br>see getAll in action:<br>"; | |
62 | - echo Var_Dump::display($db->getAll("SELECT * FROM test"))."<br>"; | |
63 | + echo MDB_Var_Dump::display($db->getAll("SELECT * FROM test"))."<br>"; | |
64 | echo "<br>see getAssoc in action:<br>"; | |
65 | - echo Var_Dump::display($db->getAssoc("SELECT * FROM test", FALSE, "", DB_FETCHMODE_ASSOC))."<br>"; | |
66 | + echo MDB_Var_Dump::display($db->getAssoc("SELECT * FROM test", FALSE, "", DB_FETCHMODE_ASSOC))."<br>"; | |
67 | echo "tableInfo on a string:<br>"; | |
68 | - echo Var_Dump::display($db->tableInfo("numbers"))."<br>"; | |
69 | + echo MDB_Var_Dump::display($db->tableInfo("numbers"))."<br>"; | |
70 | echo "<br>just a simple delete query:<br>"; | |
71 | - echo Var_Dump::display($db->query("DELETE FROM numbers"))."<br>"; | |
72 | + echo MDB_Var_Dump::display($db->query("DELETE FROM numbers"))."<br>"; | |
73 | $db->disconnect(); | |
74 | ?> | |
75 | --- ./MDB-0.9.8/MDB_test.php.org Thu Jul 4 23:07:10 2002 | |
76 | +++ ./MDB-0.9.8/MDB_test.php Thu Jul 4 23:36:41 2002 | |
77 | @@ -6,9 +6,9 @@ | |
78 | ||
79 | // MDB.php doesnt have to be included since manager.php does that | |
80 | // manager.php is only necessary for handling xml schema files | |
81 | - require_once("manager.php"); | |
82 | + require_once("MDB/manager.php"); | |
83 | // only including this to output result data | |
84 | - require_once("Var_Dump.php"); | |
85 | + require_once("MDB/Var_Dump.php"); | |
86 | ||
87 | // just for kicks you can mess up this part to see some pear error handling | |
88 | $user = 'metapear'; | |
89 | @@ -69,41 +69,41 @@ | |
90 | // lets just get row:0 and free the result | |
91 | $db->fetchRow($result, $array); | |
92 | echo "<br>row:<br>"; | |
93 | - echo Var_Dump::display($array)."<br>"; | |
94 | + echo MDB_Var_Dump::display($array)."<br>"; | |
95 | // run the query and get a result handler | |
96 | $result = $db->query($query); | |
97 | // lets just get column:0 and free the result | |
98 | $db->fetchCol($result, $array); | |
99 | echo "<br>column:<br>"; | |
100 | - echo Var_Dump::display($array)."<br>"; | |
101 | + echo MDB_Var_Dump::display($array)."<br>"; | |
102 | // run the query and get a result handler | |
103 | $result = $db->query($query); | |
104 | // lets just get column:0 and free the result | |
105 | $db->fetchCol($result, $array, DB_FETCHMODE_DEFAULT, 2); | |
106 | echo "<br>get column #2 (counting from 0):<br>"; | |
107 | - echo Var_Dump::display($array)."<br>"; | |
108 | + echo MDB_Var_Dump::display($array)."<br>"; | |
109 | // run the query and get a result handler | |
110 | $result = $db->query($query); | |
111 | echo "tableInfo:<br>"; | |
112 | - echo Var_Dump::display($db->tableInfo($result))."<br>"; | |
113 | + echo MDB_Var_Dump::display($db->tableInfo($result))."<br>"; | |
114 | // lets just get everything and free the result | |
115 | $result = $db->query($query); | |
116 | $types = array('integer', 'text', 'timestamp'); | |
117 | $db->setResultTypes($result, $types); | |
118 | $db->fetchAll($result, &$array); | |
119 | echo "<br>all:<br>"; | |
120 | - echo Var_Dump::display($array)."<br>"; | |
121 | + echo MDB_Var_Dump::display($array)."<br>"; | |
122 | // save some time with this function | |
123 | // lets just get all and free the result | |
124 | $db->queryAll($query, $array); | |
125 | echo "<br>all with just one call:<br>"; | |
126 | - echo Var_Dump::display($array)."<br>"; | |
127 | + echo MDB_Var_Dump::display($array)."<br>"; | |
128 | // run the query with the offset 1 and count 1 and get a result handler | |
129 | $result = $db->limitQuery($query, 1, 1); | |
130 | // lets just get everything but with an associative array and free the result | |
131 | $db->fetchAll($result, $array, DB_FETCHMODE_ASSOC); | |
132 | echo "<br>associative array with offset 1 and count 1:<br>"; | |
133 | - echo Var_Dump::display($array)."<br>"; | |
134 | + echo MDB_Var_Dump::display($array)."<br>"; | |
135 | // lets create a sequence | |
136 | echo "<br>create a new seq with start 3 name real_funky_id<br>"; | |
137 | $err = $db->createSequence("real_funky_id",3); | |
138 | @@ -134,35 +134,35 @@ | |
139 | ); | |
140 | $prepared_query = $db->prepareQuery("INSERT INTO numbers VALUES(?,?,?)"); | |
141 | echo "running executeMultiple<br>"; | |
142 | - echo Var_Dump::display($db->executeMultiple($prepared_query, NULL, $alldata))."<br>"; | |
143 | + echo MDB_Var_Dump::display($db->executeMultiple($prepared_query, NULL, $alldata))."<br>"; | |
144 | echo "<br>affected rows:<br>"; | |
145 | echo $db->affectedRows()."<br>"; | |
146 | $array = array(4); | |
147 | echo "<br>see getOne in action:<br>"; | |
148 | - echo Var_Dump::display($db->getOne("SELECT trans_en FROM numbers WHERE number = ?",'text',$array))."<br>"; | |
149 | + echo MDB_Var_Dump::display($db->getOne("SELECT trans_en FROM numbers WHERE number = ?",'text',$array))."<br>"; | |
150 | // You can disconnect from the database with: | |
151 | echo "<br>see getRow in action:<br>"; | |
152 | - echo Var_Dump::display($db->getRow("SELECT * FROM numbers WHERE number = ?",array('integer','text','text'),$array))."<br>"; | |
153 | + echo MDB_Var_Dump::display($db->getRow("SELECT * FROM numbers WHERE number = ?",array('integer','text','text'),$array))."<br>"; | |
154 | echo "<br>see getCol in action:<br>"; | |
155 | - echo Var_Dump::display($db->getCol("SELECT * FROM numbers",'text', 1))."<br>"; | |
156 | + echo MDB_Var_Dump::display($db->getCol("SELECT * FROM numbers",'text', 1))."<br>"; | |
157 | echo "<br>see getAll in action:<br>"; | |
158 | - echo Var_Dump::display($db->getAll("SELECT * FROM test",array('integer','text','text')))."<br>"; | |
159 | + echo MDB_Var_Dump::display($db->getAll("SELECT * FROM test",array('integer','text','text')))."<br>"; | |
160 | echo "<br>see getAssoc in action:<br>"; | |
161 | - echo Var_Dump::display($db->getAssoc("SELECT * FROM test",array('integer','text','text'), NULL, NULL, DB_FETCHMODE_ASSOC))."<br>"; | |
162 | + echo MDB_Var_Dump::display($db->getAssoc("SELECT * FROM test",array('integer','text','text'), NULL, NULL, DB_FETCHMODE_ASSOC))."<br>"; | |
163 | echo "tableInfo on a string:<br>"; | |
164 | - echo Var_Dump::display($db->tableInfo("numbers"))."<br>"; | |
165 | + echo MDB_Var_Dump::display($db->tableInfo("numbers"))."<br>"; | |
166 | echo "<br>just a simple delete query:<br>"; | |
167 | - echo Var_Dump::display($db->query("DELETE FROM numbers"))."<br>"; | |
168 | + echo MDB_Var_Dump::display($db->query("DELETE FROM numbers"))."<br>"; | |
169 | // subselect test | |
170 | $sub_select = $db->subSelect("SELECT test_name from test WHERE test_name = ".$db->getTextFieldValue('gummihuhn'), TRUE); | |
171 | - echo Var_Dump::display($sub_select)."<br>"; | |
172 | + echo MDB_Var_Dump::display($sub_select)."<br>"; | |
173 | $query_with_subselect = "SELECT * FROM test WHERE test_name IN (".$sub_select.")"; | |
174 | // run the query and get a result handler | |
175 | echo $query_with_subselect."<br>"; | |
176 | $result = $db->query($query_with_subselect); | |
177 | $db->fetchAll($result, &$array); | |
178 | echo "<br>all with subselect:<br>"; | |
179 | - echo Var_Dump::display($array)."<br>"; | |
180 | + echo MDB_Var_Dump::display($array)."<br>"; | |
181 | ||
182 | /* | |
183 | // ok now lets create a new xml schema file from the existing DB | |
184 | @@ -171,7 +171,7 @@ | |
185 | $manager->setupDatabase($dsn); | |
186 | $manager->getDefinitionFromDatabase(); | |
187 | // this is the database definition as an array | |
188 | - echo Var_Dump::display($manager->database_definition)."<br>"; | |
189 | + echo MDB_Var_Dump::display($manager->database_definition)."<br>"; | |
190 | ||
191 | // new we will write this array as an xml schema file | |
192 | $manager->debug = "Output"; | |
193 | --- ./MDB-0.9.8/Var_Dump.php.org Thu Jul 4 23:07:42 2002 | |
194 | +++ ./MDB-0.9.8/Var_Dump.php Thu Jul 4 23:34:44 2002 | |
195 | @@ -73,7 +73,7 @@ | |
196 | * - If given an object, informations about the object and the class | |
197 | * are printed. | |
198 | */ | |
199 | -class Var_Dump extends PEAR | |
200 | +class MDB_Var_Dump extends PEAR | |
201 | { | |
202 | ||
203 | ||
204 | --- ./MDB-0.9.8/driver_test.php.org Thu Jul 4 23:07:55 2002 | |
205 | +++ ./MDB-0.9.8/driver_test.php Thu Jul 4 23:11:51 2002 | |
206 | @@ -68,9 +68,9 @@ | |
207 | */ | |
208 | ||
209 | ||
210 | -require("metabase_wrapper.php"); | |
211 | -require("manager.php"); | |
212 | -require("lob.php"); | |
213 | +require("MDB/metabase_wrapper.php"); | |
214 | +require("MDB/manager.php"); | |
215 | +require("MDB/lob.php"); | |
216 | ||
217 | Function VerifyFetchedValues($database,$result,$row,&$data,&$value,&$field) | |
218 | { | |
219 | --- ./MDB-0.9.8/manager.php.org Thu Jul 4 23:08:47 2002 | |
220 | +++ ./MDB-0.9.8/manager.php Thu Jul 4 23:13:01 2002 | |
221 | @@ -47,9 +47,9 @@ | |
222 | // MDB XML Schema Manager | |
223 | // | |
224 | ||
225 | -require_once(dirname(__FILE__)."/MDB.php"); | |
226 | -require_once(dirname(__FILE__)."/parser.php"); | |
227 | -require_once(dirname(__FILE__)."/xml_parser.php"); | |
228 | +require_once("MDB/MDB.php"); | |
229 | +require_once("MDB/parser.php"); | |
230 | +require_once("MDB/xml_parser.php"); | |
231 | ||
232 | /** | |
233 | * The database manager is a class that provides a set of database | |
234 | --- ./MDB-0.9.8/metabase_wrapper.php.org Thu Jul 4 23:08:59 2002 | |
235 | +++ ./MDB-0.9.8/metabase_wrapper.php Thu Jul 4 23:21:52 2002 | |
236 | @@ -47,7 +47,7 @@ | |
237 | // Metabase Wrapper for MDB. | |
238 | // | |
239 | ||
240 | -require_once("MDB.php"); | |
241 | +require_once("MDB/MDB.php"); | |
242 | ||
243 | $metabase_databases = &$databases; | |
244 | $metabases_lobs = &$lobs; | |
245 | @@ -1274,7 +1274,7 @@ | |
246 | } | |
247 | } | |
248 | ||
249 | -class Metabase_manager_class | |
250 | +class MDB_Metabase_manager_class | |
251 | { | |
252 | var $MDB_manager_object; | |
253 | ||
254 | --- ./MDB-0.9.8/mysql.php.org Thu Jul 4 23:33:38 2002 | |
255 | +++ ./MDB-0.9.8/mysql.php Thu Jul 4 23:14:13 2002 | |
256 | @@ -50,7 +50,7 @@ | |
257 | if (!defined("MDB_MYSQL_INCLUDED")) { | |
258 | define("MDB_MYSQL_INCLUDED", 1); | |
259 | ||
260 | -require_once "common.php"; | |
261 | +require_once "MDB/common.php"; | |
262 | ||
263 | class MDB_mysql extends MDB_common | |
264 | { | |
265 | --- ./MDB-0.9.8/pear_wrapper.php.org Thu Jul 4 23:09:13 2002 | |
266 | +++ ./MDB-0.9.8/pear_wrapper.php Thu Jul 4 23:28:49 2002 | |
267 | @@ -47,7 +47,7 @@ | |
268 | // PEAR DB Wrapper for MDB. | |
269 | // | |
270 | ||
271 | -require_once "MDB.php"; | |
272 | +require_once "MDB/MDB.php"; | |
273 | ||
274 | class DB | |
275 | { | |
276 | @@ -106,7 +106,7 @@ | |
277 | } | |
278 | } | |
279 | ||
280 | -class DB_Error extends PEAR_Error | |
281 | +class MDB_DB_Error extends PEAR_Error | |
282 | { | |
283 | function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN, | |
284 | $level = E_USER_NOTICE, $debuginfo = NULL) | |
285 | @@ -119,7 +119,7 @@ | |
286 | } | |
287 | } | |
288 | ||
289 | -class DB_Warning extends PEAR_Error | |
290 | +class MDB_DB_Warning extends PEAR_Error | |
291 | { | |
292 | function DB_Warning($code = DB_WARNING, $mode = PEAR_ERROR_RETURN, | |
293 | $level = E_USER_NOTICE, $debuginfo = NULL) | |
294 | @@ -132,7 +132,7 @@ | |
295 | } | |
296 | } | |
297 | ||
298 | -class DB_result | |
299 | +class MDB_DB_result | |
300 | { | |
301 | var $dbh; | |
302 | var $result; | |
303 | @@ -200,7 +200,7 @@ | |
304 | } | |
305 | } | |
306 | ||
307 | -class DB_row | |
308 | +class MDB_DB_row | |
309 | { | |
310 | function DB_row(&$arr) | |
311 | { | |
312 | --- ./MDB-0.9.8/pgsql.php.org Thu Jul 4 23:09:21 2002 | |
313 | +++ ./MDB-0.9.8/pgsql.php Thu Jul 4 23:15:43 2002 | |
314 | @@ -51,7 +51,7 @@ | |
315 | define("MDB_PGSQL_INCLUDED", 1); | |
316 | ||
317 | ||
318 | -require_once "common.php"; | |
319 | +require_once "MDB/common.php"; | |
320 | ||
321 | class MDB_pgsql extends MDB_common | |
322 | { | |
323 | --- ./MDB-0.9.8/setup_test.php.org Thu Jul 4 23:09:36 2002 | |
324 | +++ ./MDB-0.9.8/setup_test.php Thu Jul 4 23:16:09 2002 | |
325 | @@ -47,8 +47,8 @@ | |
326 | // Metabase test suite. | |
327 | // | |
328 | ||
329 | - require("manager.php"); | |
330 | - require("metabase_wrapper.php"); | |
331 | + require("MDB/manager.php"); | |
332 | + require("MDB/metabase_wrapper.php"); | |
333 | ||
334 | Function Output($message) | |
335 | { | |
336 | --- ./MDB-0.9.8/xml_parser.php.org Thu Jul 4 23:39:33 2002 | |
337 | +++ ./MDB-0.9.8/xml_parser.php Thu Jul 4 23:31:47 2002 | |
338 | @@ -79,7 +79,7 @@ | |
339 | $xml_parser_handlers[$parser]->CharacterData($xml_parser_handlers[$parser],$data); | |
340 | } | |
341 | ||
342 | -class xml_parser_handler_class | |
343 | +class MDB_xml_parser_handler_class | |
344 | { | |
345 | var $xml_parser; | |
346 | var $error_number=0; | |
347 | @@ -166,7 +166,7 @@ | |
348 | } | |
349 | }; | |
350 | ||
351 | -class xml_parser_class | |
352 | +class MDB_xml_parser_class | |
353 | { | |
354 | var $xml_parser=0; | |
355 | var $parser_handler; | |
356 | @@ -437,7 +437,7 @@ | |
357 | return($error); | |
358 | } | |
359 | } | |
360 | - $parser=new xml_parser_class; | |
361 | + $parser=new MDB_xml_parser_class; | |
362 | $parser->store_positions=$store_positions; | |
363 | $parser->case_folding=$case_folding; | |
364 | $parser->target_encoding=$target_encoding; |