fix: oracle migration

Author: DeepDiver1975

lib/private/DB/Migrator.php

@@ -97,6 +97,14 @@ public function generateChangeScript(Schema $targetSchema) {
 		return $script;
 	}
 
+	public function filterSchemaAsset($asset): bool {
+		if ($asset instanceof AbstractAsset) {
+			$asset = $asset->getName();
+		}
+		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
+		return str_starts_with($asset, $prefix);
+	}
+
 	/**
 	 * Create a unique name for the temporary table
 	 *
@@ -108,12 +116,8 @@ protected function generateTemporaryTableName($name) {
 	}
 
 	public function createSchema() {
-		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
-		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) use ($prefix) {
-			if ($asset instanceof AbstractAsset) {
-				$asset = $asset->getName();
-			}
-			return str_starts_with($asset, $prefix);
+		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+			return $this->filterSchemaAsset($asset);
 		});
 		return $this->connection->getSchemaManager()->createSchema();
 	}
@@ -137,12 +141,8 @@ protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $conn
 			}
 		}
 
-		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
-		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) use ($prefix) {
-			if ($asset instanceof AbstractAsset) {
-				$asset = $asset->getName();
-			}
-			return str_starts_with($asset, $prefix);
+		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+			return $this->filterSchemaAsset($asset);
 		});
 		$sourceSchema = $connection->getSchemaManager()->createSchema();
 

lib/private/DB/OracleMigrator.php

@@ -23,6 +23,7 @@
 
 namespace OC\DB;
 
+use Doctrine\DBAL\Schema\AbstractAsset;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ColumnDiff;
 use Doctrine\DBAL\Schema\Index;
@@ -215,4 +216,12 @@ protected function convertStatementToScript($statement) {
 		$script .= PHP_EOL;
 		return $script;
 	}
+
+	public function filterSchemaAsset($asset): bool {
+		if ($asset instanceof AbstractAsset) {
+			$asset = $asset->getName();
+		}
+		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
+		return str_starts_with($asset, "\"$prefix");
+	}
 }

lib/private/Setup.php

@@ -350,14 +350,16 @@ public function install($options) {
 			// apply necessary migrations
 			$dbSetup->runMigrations();
 		} catch (\OC\DatabaseSetupException $e) {
+			$this->logger->logException($e);
 			$error[] = [
 				'error' => $e->getMessage(),
 				'hint' => $e->getHint()
 			];
 			return($error);
 		} catch (Exception $e) {
+			$this->logger->logException($e);
 			$error[] = [
-				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+				'error' => 'Error while trying to setup the dabase: ' . $e->getMessage(),
 				'hint' => $e->getTraceAsString()
 			];
 			return($error);