Merge pull request #1181 from nextcloud/backport-870-oracle-support

rullzer · web-flow · commit 62c89213f475 · 2016-08-31T15:15:07.000+02:00
[stable10] Fix oracle support of external storage app
diff --git a/apps/files_external/appinfo/database.xml b/apps/files_external/appinfo/database.xml
@@ -144,7 +144,7 @@
 			<field>
 				<name>value</name>
 				<type>text</type>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<length>4096</length>
 			</field>
 
diff --git a/apps/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php
@@ -208,7 +208,7 @@ public function addMount($mountPoint, $storageBackend, $authBackend, $priority,
 				'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)
 			]);
 		$query->execute();
-		return (int)$this->connection->lastInsertId('external_mounts');
+		return (int)$this->connection->lastInsertId('*PREFIX*external_mounts');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public function addMount($mountPoint, $storageBackend, $authBackend, $priority,`
`208`	`208`	`'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)`
`209`	`209`	`]);`
`210`	`210`	`$query->execute();`
`211`		`- return (int)$this->connection->lastInsertId('external_mounts');`
	`211`	`+ return (int)$this->connection->lastInsertId('PREFIXexternal_mounts');`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`/**`