Change var_dumps to exceptions

2 files changed, 7 insertions, 14 deletions

diff --git a/lib/db/mdb2schemareader.php b/lib/db/mdb2schemareader.php
index 05b9bd21289..6408c27e916 100644
--- 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 231b8068af0..cd356e7ff83 100644
--- 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);
 	}