Change var_dumps to exceptions

diff --git a/lib/db/mdb2schemareader.php b/lib/db/mdb2schemareader.php
index 05b9bd21289629b48b09d2cf6e197040dc755447..6408c27e916306cb93cfd285b41f919f1b676289 100644 (file)
--- a/lib/db/mdb2schemareader.php
+++ b/lib/db/mdb2schemareader.php
@@ -29,7 +29,7 @@ class OC_DB_MDB2SchemaReader {
                                        self::loadTable($schema, $child);
                                        break;
                                default:
-                                       var_dump($child->getName());
+                                       throw new DomainException('Unknown element: '.$child->getName());
 
                        }
                }
@@ -52,7 +52,7 @@ class OC_DB_MDB2SchemaReader {
                                        self::loadDeclaration($table, $child);
                                        break;
                                default:
-                                       var_dump($child->getName());
+                                       throw new DomainException('Unknown element: '.$child->getName());
 
                        }
                }
@@ -68,7 +68,7 @@ class OC_DB_MDB2SchemaReader {
                                        self::loadIndex($table, $child);
                                        break;
                                default:
-                                       var_dump($child->getName());
+                                       throw new DomainException('Unknown element: '.$child->getName());
 
                        }
                }
@@ -118,16 +118,11 @@ class OC_DB_MDB2SchemaReader {
                                        $options['default'] = $default;
                                        break;
                                default:
-                                       var_dump($child->getName());
+                                       throw new DomainException('Unknown element: '.$child->getName());
 
                        }
                }
                if (isset($name) && isset($type)) {
-               if ($name == 'x') {
-                       var_dump($name, $type, $options);
-                       echo '<pre>';
-                       debug_print_backtrace();
-               }
                        if (empty($options['default'])) {
                                if ($type == 'integer') {
                                        if (empty($options['default'])) {
@@ -187,13 +182,13 @@ class OC_DB_MDB2SchemaReader {
                                                        case 'sorting':
                                                                break;
                                                        default:
-                                                               var_dump($field->getName());
+                                                               throw new DomainException('Unknown element: '.$field->getName());
 
                                                }
                                        }
                                        break;
                                default:
-                                       var_dump($child->getName());
+                                       throw new DomainException('Unknown element: '.$child->getName());
 
                        }
                }
@@ -207,7 +202,7 @@ class OC_DB_MDB2SchemaReader {
                                $table->addIndex($fields, $name);
                        }
                } else {
-                       var_dump($name, $fields);
+                       throw new DomainException('Empty index definition: '.$name.' options:'. print_r($fields, true));
                }
        }
 

diff --git a/lib/db/schema.php b/lib/db/schema.php
index 231b8068af0b2f7da3da4d337e14d553a8ee6a07..cd356e7ff83ff89963eebbeff085f93924b23d8f 100644 (file)
--- a/lib/db/schema.php
+++ b/lib/db/schema.php
@@ -76,8 +76,6 @@ class OC_DB_Schema {
                $toSchema = clone $fromSchema;
                $toSchema->dropTable('user');
                $sql = $fromSchema->getMigrateToSql($toSchema, $conn->getDatabasePlatform());
-               var_dump($sql);
-               die;
                $conn->execute($sql);
        }