@@ -29,20 +29,20 @@ |
||
29 | 29 | * local storage backend in temporary folder for testing purpose |
30 | 30 | */ |
31 | 31 | class Temporary extends Local { |
32 | - public function __construct($arguments = null) { |
|
33 | - parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]); |
|
34 | - } |
|
32 | + public function __construct($arguments = null) { |
|
33 | + parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]); |
|
34 | + } |
|
35 | 35 | |
36 | - public function cleanUp() { |
|
37 | - \OC_Helper::rmdirr($this->datadir); |
|
38 | - } |
|
36 | + public function cleanUp() { |
|
37 | + \OC_Helper::rmdirr($this->datadir); |
|
38 | + } |
|
39 | 39 | |
40 | - public function __destruct() { |
|
41 | - parent::__destruct(); |
|
42 | - $this->cleanUp(); |
|
43 | - } |
|
40 | + public function __destruct() { |
|
41 | + parent::__destruct(); |
|
42 | + $this->cleanUp(); |
|
43 | + } |
|
44 | 44 | |
45 | - public function getDataDir() { |
|
46 | - return $this->datadir; |
|
47 | - } |
|
45 | + public function getDataDir() { |
|
46 | + return $this->datadir; |
|
47 | + } |
|
48 | 48 | } |
@@ -33,70 +33,70 @@ |
||
33 | 33 | * usage: resource \OC\Files\Stream\Quota::wrap($stream, $limit) |
34 | 34 | */ |
35 | 35 | class Quota extends Wrapper { |
36 | - /** |
|
37 | - * @var int $limit |
|
38 | - */ |
|
39 | - private $limit; |
|
36 | + /** |
|
37 | + * @var int $limit |
|
38 | + */ |
|
39 | + private $limit; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param resource $stream |
|
43 | - * @param int $limit |
|
44 | - * @return resource |
|
45 | - */ |
|
46 | - public static function wrap($stream, $limit) { |
|
47 | - $context = stream_context_create([ |
|
48 | - 'quota' => [ |
|
49 | - 'source' => $stream, |
|
50 | - 'limit' => $limit |
|
51 | - ] |
|
52 | - ]); |
|
53 | - return Wrapper::wrapSource($stream, $context, 'quota', self::class); |
|
54 | - } |
|
41 | + /** |
|
42 | + * @param resource $stream |
|
43 | + * @param int $limit |
|
44 | + * @return resource |
|
45 | + */ |
|
46 | + public static function wrap($stream, $limit) { |
|
47 | + $context = stream_context_create([ |
|
48 | + 'quota' => [ |
|
49 | + 'source' => $stream, |
|
50 | + 'limit' => $limit |
|
51 | + ] |
|
52 | + ]); |
|
53 | + return Wrapper::wrapSource($stream, $context, 'quota', self::class); |
|
54 | + } |
|
55 | 55 | |
56 | - public function stream_open($path, $mode, $options, &$opened_path) { |
|
57 | - $context = $this->loadContext('quota'); |
|
58 | - $this->source = $context['source']; |
|
59 | - $this->limit = $context['limit']; |
|
56 | + public function stream_open($path, $mode, $options, &$opened_path) { |
|
57 | + $context = $this->loadContext('quota'); |
|
58 | + $this->source = $context['source']; |
|
59 | + $this->limit = $context['limit']; |
|
60 | 60 | |
61 | - return true; |
|
62 | - } |
|
61 | + return true; |
|
62 | + } |
|
63 | 63 | |
64 | - public function dir_opendir($path, $options) { |
|
65 | - return false; |
|
66 | - } |
|
64 | + public function dir_opendir($path, $options) { |
|
65 | + return false; |
|
66 | + } |
|
67 | 67 | |
68 | - public function stream_seek($offset, $whence = SEEK_SET) { |
|
69 | - if ($whence === SEEK_END) { |
|
70 | - // go to the end to find out last position's offset |
|
71 | - $oldOffset = $this->stream_tell(); |
|
72 | - if (fseek($this->source, 0, $whence) !== 0) { |
|
73 | - return false; |
|
74 | - } |
|
75 | - $whence = SEEK_SET; |
|
76 | - $offset = $this->stream_tell() + $offset; |
|
77 | - $this->limit += $oldOffset - $offset; |
|
78 | - } elseif ($whence === SEEK_SET) { |
|
79 | - $this->limit += $this->stream_tell() - $offset; |
|
80 | - } else { |
|
81 | - $this->limit -= $offset; |
|
82 | - } |
|
83 | - // this wrapper needs to return "true" for success. |
|
84 | - // the fseek call itself returns 0 on succeess |
|
85 | - return fseek($this->source, $offset, $whence) === 0; |
|
86 | - } |
|
68 | + public function stream_seek($offset, $whence = SEEK_SET) { |
|
69 | + if ($whence === SEEK_END) { |
|
70 | + // go to the end to find out last position's offset |
|
71 | + $oldOffset = $this->stream_tell(); |
|
72 | + if (fseek($this->source, 0, $whence) !== 0) { |
|
73 | + return false; |
|
74 | + } |
|
75 | + $whence = SEEK_SET; |
|
76 | + $offset = $this->stream_tell() + $offset; |
|
77 | + $this->limit += $oldOffset - $offset; |
|
78 | + } elseif ($whence === SEEK_SET) { |
|
79 | + $this->limit += $this->stream_tell() - $offset; |
|
80 | + } else { |
|
81 | + $this->limit -= $offset; |
|
82 | + } |
|
83 | + // this wrapper needs to return "true" for success. |
|
84 | + // the fseek call itself returns 0 on succeess |
|
85 | + return fseek($this->source, $offset, $whence) === 0; |
|
86 | + } |
|
87 | 87 | |
88 | - public function stream_read($count) { |
|
89 | - $this->limit -= $count; |
|
90 | - return fread($this->source, $count); |
|
91 | - } |
|
88 | + public function stream_read($count) { |
|
89 | + $this->limit -= $count; |
|
90 | + return fread($this->source, $count); |
|
91 | + } |
|
92 | 92 | |
93 | - public function stream_write($data) { |
|
94 | - $size = strlen($data); |
|
95 | - if ($size > $this->limit) { |
|
96 | - $data = substr($data, 0, $this->limit); |
|
97 | - $size = $this->limit; |
|
98 | - } |
|
99 | - $this->limit -= $size; |
|
100 | - return fwrite($this->source, $data); |
|
101 | - } |
|
93 | + public function stream_write($data) { |
|
94 | + $size = strlen($data); |
|
95 | + if ($size > $this->limit) { |
|
96 | + $data = substr($data, 0, $this->limit); |
|
97 | + $size = $this->limit; |
|
98 | + } |
|
99 | + $this->limit -= $size; |
|
100 | + return fwrite($this->source, $data); |
|
101 | + } |
|
102 | 102 | } |
@@ -28,40 +28,40 @@ |
||
28 | 28 | |
29 | 29 | class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IHomeStorage { |
30 | 30 | |
31 | - /** |
|
32 | - * The home user storage requires a user object to create a unique storage id |
|
33 | - * @param array $params |
|
34 | - */ |
|
35 | - public function __construct($params) { |
|
36 | - if (! isset($params['user']) || ! $params['user'] instanceof User) { |
|
37 | - throw new \Exception('missing user object in parameters'); |
|
38 | - } |
|
39 | - $this->user = $params['user']; |
|
40 | - parent::__construct($params); |
|
41 | - } |
|
31 | + /** |
|
32 | + * The home user storage requires a user object to create a unique storage id |
|
33 | + * @param array $params |
|
34 | + */ |
|
35 | + public function __construct($params) { |
|
36 | + if (! isset($params['user']) || ! $params['user'] instanceof User) { |
|
37 | + throw new \Exception('missing user object in parameters'); |
|
38 | + } |
|
39 | + $this->user = $params['user']; |
|
40 | + parent::__construct($params); |
|
41 | + } |
|
42 | 42 | |
43 | - public function getId() { |
|
44 | - return 'object::user:' . $this->user->getUID(); |
|
45 | - } |
|
43 | + public function getId() { |
|
44 | + return 'object::user:' . $this->user->getUID(); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * get the owner of a path |
|
49 | - * |
|
50 | - * @param string $path The path to get the owner |
|
51 | - * @return false|string uid |
|
52 | - */ |
|
53 | - public function getOwner($path) { |
|
54 | - if (is_object($this->user)) { |
|
55 | - return $this->user->getUID(); |
|
56 | - } |
|
57 | - return false; |
|
58 | - } |
|
47 | + /** |
|
48 | + * get the owner of a path |
|
49 | + * |
|
50 | + * @param string $path The path to get the owner |
|
51 | + * @return false|string uid |
|
52 | + */ |
|
53 | + public function getOwner($path) { |
|
54 | + if (is_object($this->user)) { |
|
55 | + return $this->user->getUID(); |
|
56 | + } |
|
57 | + return false; |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @param string $path, optional |
|
62 | - * @return \OC\User\User |
|
63 | - */ |
|
64 | - public function getUser($path = null) { |
|
65 | - return $this->user; |
|
66 | - } |
|
60 | + /** |
|
61 | + * @param string $path, optional |
|
62 | + * @return \OC\User\User |
|
63 | + */ |
|
64 | + public function getUser($path = null) { |
|
65 | + return $this->user; |
|
66 | + } |
|
67 | 67 | } |
@@ -24,17 +24,17 @@ |
||
24 | 24 | namespace OC\DB; |
25 | 25 | |
26 | 26 | class MigrationException extends \Exception { |
27 | - private $table; |
|
27 | + private $table; |
|
28 | 28 | |
29 | - public function __construct($table, $message) { |
|
30 | - $this->table = $table; |
|
31 | - parent::__construct($message); |
|
32 | - } |
|
29 | + public function __construct($table, $message) { |
|
30 | + $this->table = $table; |
|
31 | + parent::__construct($message); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * @return string |
|
36 | - */ |
|
37 | - public function getTable() { |
|
38 | - return $this->table; |
|
39 | - } |
|
34 | + /** |
|
35 | + * @return string |
|
36 | + */ |
|
37 | + public function getTable() { |
|
38 | + return $this->table; |
|
39 | + } |
|
40 | 40 | } |
@@ -25,68 +25,68 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\ICompositeExpression; |
26 | 26 | |
27 | 27 | class CompositeExpression implements ICompositeExpression, \Countable { |
28 | - /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */ |
|
29 | - protected $compositeExpression; |
|
28 | + /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */ |
|
29 | + protected $compositeExpression; |
|
30 | 30 | |
31 | - /** |
|
32 | - * Constructor. |
|
33 | - * |
|
34 | - * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression |
|
35 | - */ |
|
36 | - public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) { |
|
37 | - $this->compositeExpression = $compositeExpression; |
|
38 | - } |
|
31 | + /** |
|
32 | + * Constructor. |
|
33 | + * |
|
34 | + * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression |
|
35 | + */ |
|
36 | + public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) { |
|
37 | + $this->compositeExpression = $compositeExpression; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Adds multiple parts to composite expression. |
|
42 | - * |
|
43 | - * @param array $parts |
|
44 | - * |
|
45 | - * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
46 | - */ |
|
47 | - public function addMultiple(array $parts = []) { |
|
48 | - $this->compositeExpression->addMultiple($parts); |
|
40 | + /** |
|
41 | + * Adds multiple parts to composite expression. |
|
42 | + * |
|
43 | + * @param array $parts |
|
44 | + * |
|
45 | + * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
46 | + */ |
|
47 | + public function addMultiple(array $parts = []) { |
|
48 | + $this->compositeExpression->addMultiple($parts); |
|
49 | 49 | |
50 | - return $this; |
|
51 | - } |
|
50 | + return $this; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Adds an expression to composite expression. |
|
55 | - * |
|
56 | - * @param mixed $part |
|
57 | - * |
|
58 | - * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
59 | - */ |
|
60 | - public function add($part) { |
|
61 | - $this->compositeExpression->add($part); |
|
53 | + /** |
|
54 | + * Adds an expression to composite expression. |
|
55 | + * |
|
56 | + * @param mixed $part |
|
57 | + * |
|
58 | + * @return \OCP\DB\QueryBuilder\ICompositeExpression |
|
59 | + */ |
|
60 | + public function add($part) { |
|
61 | + $this->compositeExpression->add($part); |
|
62 | 62 | |
63 | - return $this; |
|
64 | - } |
|
63 | + return $this; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Retrieves the amount of expressions on composite expression. |
|
68 | - * |
|
69 | - * @return integer |
|
70 | - */ |
|
71 | - public function count() { |
|
72 | - return $this->compositeExpression->count(); |
|
73 | - } |
|
66 | + /** |
|
67 | + * Retrieves the amount of expressions on composite expression. |
|
68 | + * |
|
69 | + * @return integer |
|
70 | + */ |
|
71 | + public function count() { |
|
72 | + return $this->compositeExpression->count(); |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Returns the type of this composite expression (AND/OR). |
|
77 | - * |
|
78 | - * @return string |
|
79 | - */ |
|
80 | - public function getType() { |
|
81 | - return $this->compositeExpression->getType(); |
|
82 | - } |
|
75 | + /** |
|
76 | + * Returns the type of this composite expression (AND/OR). |
|
77 | + * |
|
78 | + * @return string |
|
79 | + */ |
|
80 | + public function getType() { |
|
81 | + return $this->compositeExpression->getType(); |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * Retrieves the string representation of this composite expression. |
|
86 | - * |
|
87 | - * @return string |
|
88 | - */ |
|
89 | - public function __toString() { |
|
90 | - return (string) $this->compositeExpression; |
|
91 | - } |
|
84 | + /** |
|
85 | + * Retrieves the string representation of this composite expression. |
|
86 | + * |
|
87 | + * @return string |
|
88 | + */ |
|
89 | + public function __toString() { |
|
90 | + return (string) $this->compositeExpression; |
|
91 | + } |
|
92 | 92 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\ILiteral; |
26 | 26 | |
27 | 27 | class Literal implements ILiteral { |
28 | - /** @var mixed */ |
|
29 | - protected $literal; |
|
28 | + /** @var mixed */ |
|
29 | + protected $literal; |
|
30 | 30 | |
31 | - public function __construct($literal) { |
|
32 | - $this->literal = $literal; |
|
33 | - } |
|
31 | + public function __construct($literal) { |
|
32 | + $this->literal = $literal; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->literal; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->literal; |
|
40 | + } |
|
41 | 41 | } |
@@ -29,47 +29,47 @@ |
||
29 | 29 | use Doctrine\DBAL\Schema\Table; |
30 | 30 | |
31 | 31 | class MySQLMigrator extends Migrator { |
32 | - /** |
|
33 | - * @param Schema $targetSchema |
|
34 | - * @param \Doctrine\DBAL\Connection $connection |
|
35 | - * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
36 | - */ |
|
37 | - protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
38 | - $platform = $connection->getDatabasePlatform(); |
|
39 | - $platform->registerDoctrineTypeMapping('enum', 'string'); |
|
40 | - $platform->registerDoctrineTypeMapping('bit', 'string'); |
|
32 | + /** |
|
33 | + * @param Schema $targetSchema |
|
34 | + * @param \Doctrine\DBAL\Connection $connection |
|
35 | + * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
36 | + */ |
|
37 | + protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
38 | + $platform = $connection->getDatabasePlatform(); |
|
39 | + $platform->registerDoctrineTypeMapping('enum', 'string'); |
|
40 | + $platform->registerDoctrineTypeMapping('bit', 'string'); |
|
41 | 41 | |
42 | - $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
42 | + $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
43 | 43 | |
44 | - // identifiers need to be quoted for mysql |
|
45 | - foreach ($schemaDiff->changedTables as $tableDiff) { |
|
46 | - $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name); |
|
47 | - foreach ($tableDiff->changedColumns as $column) { |
|
48 | - $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName); |
|
49 | - } |
|
50 | - } |
|
44 | + // identifiers need to be quoted for mysql |
|
45 | + foreach ($schemaDiff->changedTables as $tableDiff) { |
|
46 | + $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name); |
|
47 | + foreach ($tableDiff->changedColumns as $column) { |
|
48 | + $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName); |
|
49 | + } |
|
50 | + } |
|
51 | 51 | |
52 | - return $schemaDiff; |
|
53 | - } |
|
52 | + return $schemaDiff; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Speed up migration test by disabling autocommit and unique indexes check |
|
57 | - * |
|
58 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
59 | - * @throws \OC\DB\MigrationException |
|
60 | - */ |
|
61 | - protected function checkTableMigrate(Table $table) { |
|
62 | - $this->connection->exec('SET autocommit=0'); |
|
63 | - $this->connection->exec('SET unique_checks=0'); |
|
55 | + /** |
|
56 | + * Speed up migration test by disabling autocommit and unique indexes check |
|
57 | + * |
|
58 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
59 | + * @throws \OC\DB\MigrationException |
|
60 | + */ |
|
61 | + protected function checkTableMigrate(Table $table) { |
|
62 | + $this->connection->exec('SET autocommit=0'); |
|
63 | + $this->connection->exec('SET unique_checks=0'); |
|
64 | 64 | |
65 | - try { |
|
66 | - parent::checkTableMigrate($table); |
|
67 | - } catch (\Exception $e) { |
|
68 | - $this->connection->exec('SET unique_checks=1'); |
|
69 | - $this->connection->exec('SET autocommit=1'); |
|
70 | - throw new MigrationException($table->getName(), $e->getMessage()); |
|
71 | - } |
|
72 | - $this->connection->exec('SET unique_checks=1'); |
|
73 | - $this->connection->exec('SET autocommit=1'); |
|
74 | - } |
|
65 | + try { |
|
66 | + parent::checkTableMigrate($table); |
|
67 | + } catch (\Exception $e) { |
|
68 | + $this->connection->exec('SET unique_checks=1'); |
|
69 | + $this->connection->exec('SET autocommit=1'); |
|
70 | + throw new MigrationException($table->getName(), $e->getMessage()); |
|
71 | + } |
|
72 | + $this->connection->exec('SET unique_checks=1'); |
|
73 | + $this->connection->exec('SET autocommit=1'); |
|
74 | + } |
|
75 | 75 | } |
@@ -32,41 +32,41 @@ |
||
32 | 32 | */ |
33 | 33 | class PgSqlTools { |
34 | 34 | |
35 | - /** @var \OCP\IConfig */ |
|
36 | - private $config; |
|
35 | + /** @var \OCP\IConfig */ |
|
36 | + private $config; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param \OCP\IConfig $config |
|
40 | - */ |
|
41 | - public function __construct(IConfig $config) { |
|
42 | - $this->config = $config; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @param \OCP\IConfig $config |
|
40 | + */ |
|
41 | + public function __construct(IConfig $config) { |
|
42 | + $this->config = $config; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @brief Resynchronizes all sequences of a database after using INSERTs |
|
47 | - * without leaving out the auto-incremented column. |
|
48 | - * @param \OC\DB\Connection $conn |
|
49 | - * @return null |
|
50 | - */ |
|
51 | - public function resynchronizeDatabaseSequences(Connection $conn) { |
|
52 | - $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
|
53 | - $databaseName = $conn->getDatabase(); |
|
54 | - $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression); |
|
45 | + /** |
|
46 | + * @brief Resynchronizes all sequences of a database after using INSERTs |
|
47 | + * without leaving out the auto-incremented column. |
|
48 | + * @param \OC\DB\Connection $conn |
|
49 | + * @return null |
|
50 | + */ |
|
51 | + public function resynchronizeDatabaseSequences(Connection $conn) { |
|
52 | + $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
|
53 | + $databaseName = $conn->getDatabase(); |
|
54 | + $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression); |
|
55 | 55 | |
56 | - foreach ($conn->getSchemaManager()->listSequences() as $sequence) { |
|
57 | - $sequenceName = $sequence->getName(); |
|
58 | - $sqlInfo = 'SELECT table_schema, table_name, column_name |
|
56 | + foreach ($conn->getSchemaManager()->listSequences() as $sequence) { |
|
57 | + $sequenceName = $sequence->getName(); |
|
58 | + $sqlInfo = 'SELECT table_schema, table_name, column_name |
|
59 | 59 | FROM information_schema.columns |
60 | 60 | WHERE column_default = ? AND table_catalog = ?'; |
61 | - $sequenceInfo = $conn->fetchAssoc($sqlInfo, [ |
|
62 | - "nextval('$sequenceName'::regclass)", |
|
63 | - $databaseName |
|
64 | - ]); |
|
65 | - $tableName = $sequenceInfo['table_name']; |
|
66 | - $columnName = $sequenceInfo['column_name']; |
|
67 | - $sqlMaxId = "SELECT MAX($columnName) FROM $tableName"; |
|
68 | - $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))"; |
|
69 | - $conn->executeQuery($sqlSetval); |
|
70 | - } |
|
71 | - } |
|
61 | + $sequenceInfo = $conn->fetchAssoc($sqlInfo, [ |
|
62 | + "nextval('$sequenceName'::regclass)", |
|
63 | + $databaseName |
|
64 | + ]); |
|
65 | + $tableName = $sequenceInfo['table_name']; |
|
66 | + $columnName = $sequenceInfo['column_name']; |
|
67 | + $sqlMaxId = "SELECT MAX($columnName) FROM $tableName"; |
|
68 | + $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))"; |
|
69 | + $conn->executeQuery($sqlSetval); |
|
70 | + } |
|
71 | + } |
|
72 | 72 | } |
@@ -37,312 +37,312 @@ |
||
37 | 37 | |
38 | 38 | class MDB2SchemaReader { |
39 | 39 | |
40 | - /** |
|
41 | - * @var string $DBTABLEPREFIX |
|
42 | - */ |
|
43 | - protected $DBTABLEPREFIX; |
|
40 | + /** |
|
41 | + * @var string $DBTABLEPREFIX |
|
42 | + */ |
|
43 | + protected $DBTABLEPREFIX; |
|
44 | 44 | |
45 | - /** |
|
46 | - * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
47 | - */ |
|
48 | - protected $platform; |
|
45 | + /** |
|
46 | + * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
47 | + */ |
|
48 | + protected $platform; |
|
49 | 49 | |
50 | - /** @var IConfig */ |
|
51 | - protected $config; |
|
50 | + /** @var IConfig */ |
|
51 | + protected $config; |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param \OCP\IConfig $config |
|
55 | - * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
56 | - */ |
|
57 | - public function __construct(IConfig $config, AbstractPlatform $platform) { |
|
58 | - $this->platform = $platform; |
|
59 | - $this->config = $config; |
|
60 | - $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_'); |
|
61 | - } |
|
53 | + /** |
|
54 | + * @param \OCP\IConfig $config |
|
55 | + * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
56 | + */ |
|
57 | + public function __construct(IConfig $config, AbstractPlatform $platform) { |
|
58 | + $this->platform = $platform; |
|
59 | + $this->config = $config; |
|
60 | + $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_'); |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @param string $file |
|
65 | - * @param Schema $schema |
|
66 | - * @return Schema |
|
67 | - * @throws \DomainException |
|
68 | - */ |
|
69 | - public function loadSchemaFromFile($file, Schema $schema) { |
|
70 | - $loadEntities = libxml_disable_entity_loader(false); |
|
71 | - $xml = simplexml_load_file($file); |
|
72 | - libxml_disable_entity_loader($loadEntities); |
|
73 | - foreach ($xml->children() as $child) { |
|
74 | - /** |
|
75 | - * @var \SimpleXMLElement $child |
|
76 | - */ |
|
77 | - switch ($child->getName()) { |
|
78 | - case 'name': |
|
79 | - case 'create': |
|
80 | - case 'overwrite': |
|
81 | - case 'charset': |
|
82 | - break; |
|
83 | - case 'table': |
|
84 | - $this->loadTable($schema, $child); |
|
85 | - break; |
|
86 | - default: |
|
87 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
63 | + /** |
|
64 | + * @param string $file |
|
65 | + * @param Schema $schema |
|
66 | + * @return Schema |
|
67 | + * @throws \DomainException |
|
68 | + */ |
|
69 | + public function loadSchemaFromFile($file, Schema $schema) { |
|
70 | + $loadEntities = libxml_disable_entity_loader(false); |
|
71 | + $xml = simplexml_load_file($file); |
|
72 | + libxml_disable_entity_loader($loadEntities); |
|
73 | + foreach ($xml->children() as $child) { |
|
74 | + /** |
|
75 | + * @var \SimpleXMLElement $child |
|
76 | + */ |
|
77 | + switch ($child->getName()) { |
|
78 | + case 'name': |
|
79 | + case 'create': |
|
80 | + case 'overwrite': |
|
81 | + case 'charset': |
|
82 | + break; |
|
83 | + case 'table': |
|
84 | + $this->loadTable($schema, $child); |
|
85 | + break; |
|
86 | + default: |
|
87 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
88 | 88 | |
89 | - } |
|
90 | - } |
|
91 | - return $schema; |
|
92 | - } |
|
89 | + } |
|
90 | + } |
|
91 | + return $schema; |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * @param \Doctrine\DBAL\Schema\Schema $schema |
|
96 | - * @param \SimpleXMLElement $xml |
|
97 | - * @throws \DomainException |
|
98 | - */ |
|
99 | - private function loadTable($schema, $xml) { |
|
100 | - $table = null; |
|
101 | - foreach ($xml->children() as $child) { |
|
102 | - /** |
|
103 | - * @var \SimpleXMLElement $child |
|
104 | - */ |
|
105 | - switch ($child->getName()) { |
|
106 | - case 'name': |
|
107 | - $name = (string)$child; |
|
108 | - $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name); |
|
109 | - $name = $this->platform->quoteIdentifier($name); |
|
110 | - $table = $schema->createTable($name); |
|
111 | - break; |
|
112 | - case 'create': |
|
113 | - case 'overwrite': |
|
114 | - case 'charset': |
|
115 | - break; |
|
116 | - case 'declaration': |
|
117 | - if (is_null($table)) { |
|
118 | - throw new \DomainException('Table declaration before table name'); |
|
119 | - } |
|
120 | - $this->loadDeclaration($table, $child); |
|
121 | - break; |
|
122 | - default: |
|
123 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
94 | + /** |
|
95 | + * @param \Doctrine\DBAL\Schema\Schema $schema |
|
96 | + * @param \SimpleXMLElement $xml |
|
97 | + * @throws \DomainException |
|
98 | + */ |
|
99 | + private function loadTable($schema, $xml) { |
|
100 | + $table = null; |
|
101 | + foreach ($xml->children() as $child) { |
|
102 | + /** |
|
103 | + * @var \SimpleXMLElement $child |
|
104 | + */ |
|
105 | + switch ($child->getName()) { |
|
106 | + case 'name': |
|
107 | + $name = (string)$child; |
|
108 | + $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name); |
|
109 | + $name = $this->platform->quoteIdentifier($name); |
|
110 | + $table = $schema->createTable($name); |
|
111 | + break; |
|
112 | + case 'create': |
|
113 | + case 'overwrite': |
|
114 | + case 'charset': |
|
115 | + break; |
|
116 | + case 'declaration': |
|
117 | + if (is_null($table)) { |
|
118 | + throw new \DomainException('Table declaration before table name'); |
|
119 | + } |
|
120 | + $this->loadDeclaration($table, $child); |
|
121 | + break; |
|
122 | + default: |
|
123 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
124 | 124 | |
125 | - } |
|
126 | - } |
|
127 | - } |
|
125 | + } |
|
126 | + } |
|
127 | + } |
|
128 | 128 | |
129 | - /** |
|
130 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
131 | - * @param \SimpleXMLElement $xml |
|
132 | - * @throws \DomainException |
|
133 | - */ |
|
134 | - private function loadDeclaration($table, $xml) { |
|
135 | - foreach ($xml->children() as $child) { |
|
136 | - /** |
|
137 | - * @var \SimpleXMLElement $child |
|
138 | - */ |
|
139 | - switch ($child->getName()) { |
|
140 | - case 'field': |
|
141 | - $this->loadField($table, $child); |
|
142 | - break; |
|
143 | - case 'index': |
|
144 | - $this->loadIndex($table, $child); |
|
145 | - break; |
|
146 | - default: |
|
147 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
129 | + /** |
|
130 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
131 | + * @param \SimpleXMLElement $xml |
|
132 | + * @throws \DomainException |
|
133 | + */ |
|
134 | + private function loadDeclaration($table, $xml) { |
|
135 | + foreach ($xml->children() as $child) { |
|
136 | + /** |
|
137 | + * @var \SimpleXMLElement $child |
|
138 | + */ |
|
139 | + switch ($child->getName()) { |
|
140 | + case 'field': |
|
141 | + $this->loadField($table, $child); |
|
142 | + break; |
|
143 | + case 'index': |
|
144 | + $this->loadIndex($table, $child); |
|
145 | + break; |
|
146 | + default: |
|
147 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
148 | 148 | |
149 | - } |
|
150 | - } |
|
151 | - } |
|
149 | + } |
|
150 | + } |
|
151 | + } |
|
152 | 152 | |
153 | - /** |
|
154 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
155 | - * @param \SimpleXMLElement $xml |
|
156 | - * @throws \DomainException |
|
157 | - */ |
|
158 | - private function loadField($table, $xml) { |
|
159 | - $options = [ 'notnull' => false ]; |
|
160 | - foreach ($xml->children() as $child) { |
|
161 | - /** |
|
162 | - * @var \SimpleXMLElement $child |
|
163 | - */ |
|
164 | - switch ($child->getName()) { |
|
165 | - case 'name': |
|
166 | - $name = (string)$child; |
|
167 | - $name = $this->platform->quoteIdentifier($name); |
|
168 | - break; |
|
169 | - case 'type': |
|
170 | - $type = (string)$child; |
|
171 | - switch ($type) { |
|
172 | - case 'text': |
|
173 | - $type = 'string'; |
|
174 | - break; |
|
175 | - case 'clob': |
|
176 | - $type = 'text'; |
|
177 | - break; |
|
178 | - case 'timestamp': |
|
179 | - $type = 'datetime'; |
|
180 | - break; |
|
181 | - case 'numeric': |
|
182 | - $type = 'decimal'; |
|
183 | - break; |
|
184 | - } |
|
185 | - break; |
|
186 | - case 'length': |
|
187 | - $length = (string)$child; |
|
188 | - $options['length'] = $length; |
|
189 | - break; |
|
190 | - case 'unsigned': |
|
191 | - $unsigned = $this->asBool($child); |
|
192 | - $options['unsigned'] = $unsigned; |
|
193 | - break; |
|
194 | - case 'notnull': |
|
195 | - $notnull = $this->asBool($child); |
|
196 | - $options['notnull'] = $notnull; |
|
197 | - break; |
|
198 | - case 'autoincrement': |
|
199 | - $autoincrement = $this->asBool($child); |
|
200 | - $options['autoincrement'] = $autoincrement; |
|
201 | - break; |
|
202 | - case 'default': |
|
203 | - $default = (string)$child; |
|
204 | - $options['default'] = $default; |
|
205 | - break; |
|
206 | - case 'comments': |
|
207 | - $comment = (string)$child; |
|
208 | - $options['comment'] = $comment; |
|
209 | - break; |
|
210 | - case 'primary': |
|
211 | - $primary = $this->asBool($child); |
|
212 | - $options['primary'] = $primary; |
|
213 | - break; |
|
214 | - case 'precision': |
|
215 | - $precision = (string)$child; |
|
216 | - $options['precision'] = $precision; |
|
217 | - break; |
|
218 | - case 'scale': |
|
219 | - $scale = (string)$child; |
|
220 | - $options['scale'] = $scale; |
|
221 | - break; |
|
222 | - default: |
|
223 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
153 | + /** |
|
154 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
155 | + * @param \SimpleXMLElement $xml |
|
156 | + * @throws \DomainException |
|
157 | + */ |
|
158 | + private function loadField($table, $xml) { |
|
159 | + $options = [ 'notnull' => false ]; |
|
160 | + foreach ($xml->children() as $child) { |
|
161 | + /** |
|
162 | + * @var \SimpleXMLElement $child |
|
163 | + */ |
|
164 | + switch ($child->getName()) { |
|
165 | + case 'name': |
|
166 | + $name = (string)$child; |
|
167 | + $name = $this->platform->quoteIdentifier($name); |
|
168 | + break; |
|
169 | + case 'type': |
|
170 | + $type = (string)$child; |
|
171 | + switch ($type) { |
|
172 | + case 'text': |
|
173 | + $type = 'string'; |
|
174 | + break; |
|
175 | + case 'clob': |
|
176 | + $type = 'text'; |
|
177 | + break; |
|
178 | + case 'timestamp': |
|
179 | + $type = 'datetime'; |
|
180 | + break; |
|
181 | + case 'numeric': |
|
182 | + $type = 'decimal'; |
|
183 | + break; |
|
184 | + } |
|
185 | + break; |
|
186 | + case 'length': |
|
187 | + $length = (string)$child; |
|
188 | + $options['length'] = $length; |
|
189 | + break; |
|
190 | + case 'unsigned': |
|
191 | + $unsigned = $this->asBool($child); |
|
192 | + $options['unsigned'] = $unsigned; |
|
193 | + break; |
|
194 | + case 'notnull': |
|
195 | + $notnull = $this->asBool($child); |
|
196 | + $options['notnull'] = $notnull; |
|
197 | + break; |
|
198 | + case 'autoincrement': |
|
199 | + $autoincrement = $this->asBool($child); |
|
200 | + $options['autoincrement'] = $autoincrement; |
|
201 | + break; |
|
202 | + case 'default': |
|
203 | + $default = (string)$child; |
|
204 | + $options['default'] = $default; |
|
205 | + break; |
|
206 | + case 'comments': |
|
207 | + $comment = (string)$child; |
|
208 | + $options['comment'] = $comment; |
|
209 | + break; |
|
210 | + case 'primary': |
|
211 | + $primary = $this->asBool($child); |
|
212 | + $options['primary'] = $primary; |
|
213 | + break; |
|
214 | + case 'precision': |
|
215 | + $precision = (string)$child; |
|
216 | + $options['precision'] = $precision; |
|
217 | + break; |
|
218 | + case 'scale': |
|
219 | + $scale = (string)$child; |
|
220 | + $options['scale'] = $scale; |
|
221 | + break; |
|
222 | + default: |
|
223 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
224 | 224 | |
225 | - } |
|
226 | - } |
|
227 | - if (isset($name) && isset($type)) { |
|
228 | - if (isset($options['default']) && empty($options['default'])) { |
|
229 | - if (empty($options['notnull']) || !$options['notnull']) { |
|
230 | - unset($options['default']); |
|
231 | - $options['notnull'] = false; |
|
232 | - } else { |
|
233 | - $options['default'] = ''; |
|
234 | - } |
|
235 | - if ($type == 'integer' || $type == 'decimal') { |
|
236 | - $options['default'] = 0; |
|
237 | - } elseif ($type == 'boolean') { |
|
238 | - $options['default'] = false; |
|
239 | - } |
|
240 | - if (!empty($options['autoincrement']) && $options['autoincrement']) { |
|
241 | - unset($options['default']); |
|
242 | - } |
|
243 | - } |
|
244 | - if ($type === 'integer' && isset($options['default'])) { |
|
245 | - $options['default'] = (int)$options['default']; |
|
246 | - } |
|
247 | - if ($type === 'integer' && isset($options['length'])) { |
|
248 | - $length = $options['length']; |
|
249 | - if ($length < 4) { |
|
250 | - $type = 'smallint'; |
|
251 | - } elseif ($length > 4) { |
|
252 | - $type = 'bigint'; |
|
253 | - } |
|
254 | - } |
|
255 | - if ($type === 'boolean' && isset($options['default'])) { |
|
256 | - $options['default'] = $this->asBool($options['default']); |
|
257 | - } |
|
258 | - if (!empty($options['autoincrement']) |
|
259 | - && !empty($options['notnull']) |
|
260 | - ) { |
|
261 | - $options['primary'] = true; |
|
262 | - } |
|
225 | + } |
|
226 | + } |
|
227 | + if (isset($name) && isset($type)) { |
|
228 | + if (isset($options['default']) && empty($options['default'])) { |
|
229 | + if (empty($options['notnull']) || !$options['notnull']) { |
|
230 | + unset($options['default']); |
|
231 | + $options['notnull'] = false; |
|
232 | + } else { |
|
233 | + $options['default'] = ''; |
|
234 | + } |
|
235 | + if ($type == 'integer' || $type == 'decimal') { |
|
236 | + $options['default'] = 0; |
|
237 | + } elseif ($type == 'boolean') { |
|
238 | + $options['default'] = false; |
|
239 | + } |
|
240 | + if (!empty($options['autoincrement']) && $options['autoincrement']) { |
|
241 | + unset($options['default']); |
|
242 | + } |
|
243 | + } |
|
244 | + if ($type === 'integer' && isset($options['default'])) { |
|
245 | + $options['default'] = (int)$options['default']; |
|
246 | + } |
|
247 | + if ($type === 'integer' && isset($options['length'])) { |
|
248 | + $length = $options['length']; |
|
249 | + if ($length < 4) { |
|
250 | + $type = 'smallint'; |
|
251 | + } elseif ($length > 4) { |
|
252 | + $type = 'bigint'; |
|
253 | + } |
|
254 | + } |
|
255 | + if ($type === 'boolean' && isset($options['default'])) { |
|
256 | + $options['default'] = $this->asBool($options['default']); |
|
257 | + } |
|
258 | + if (!empty($options['autoincrement']) |
|
259 | + && !empty($options['notnull']) |
|
260 | + ) { |
|
261 | + $options['primary'] = true; |
|
262 | + } |
|
263 | 263 | |
264 | - $table->addColumn($name, $type, $options); |
|
265 | - if (!empty($options['primary']) && $options['primary']) { |
|
266 | - $table->setPrimaryKey([$name]); |
|
267 | - } |
|
268 | - } |
|
269 | - } |
|
264 | + $table->addColumn($name, $type, $options); |
|
265 | + if (!empty($options['primary']) && $options['primary']) { |
|
266 | + $table->setPrimaryKey([$name]); |
|
267 | + } |
|
268 | + } |
|
269 | + } |
|
270 | 270 | |
271 | - /** |
|
272 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
273 | - * @param \SimpleXMLElement $xml |
|
274 | - * @throws \DomainException |
|
275 | - */ |
|
276 | - private function loadIndex($table, $xml) { |
|
277 | - $name = null; |
|
278 | - $fields = []; |
|
279 | - foreach ($xml->children() as $child) { |
|
280 | - /** |
|
281 | - * @var \SimpleXMLElement $child |
|
282 | - */ |
|
283 | - switch ($child->getName()) { |
|
284 | - case 'name': |
|
285 | - $name = (string)$child; |
|
286 | - break; |
|
287 | - case 'primary': |
|
288 | - $primary = $this->asBool($child); |
|
289 | - break; |
|
290 | - case 'unique': |
|
291 | - $unique = $this->asBool($child); |
|
292 | - break; |
|
293 | - case 'field': |
|
294 | - foreach ($child->children() as $field) { |
|
295 | - /** |
|
296 | - * @var \SimpleXMLElement $field |
|
297 | - */ |
|
298 | - switch ($field->getName()) { |
|
299 | - case 'name': |
|
300 | - $field_name = (string)$field; |
|
301 | - $field_name = $this->platform->quoteIdentifier($field_name); |
|
302 | - $fields[] = $field_name; |
|
303 | - break; |
|
304 | - case 'sorting': |
|
305 | - break; |
|
306 | - default: |
|
307 | - throw new \DomainException('Unknown element: ' . $field->getName()); |
|
271 | + /** |
|
272 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
273 | + * @param \SimpleXMLElement $xml |
|
274 | + * @throws \DomainException |
|
275 | + */ |
|
276 | + private function loadIndex($table, $xml) { |
|
277 | + $name = null; |
|
278 | + $fields = []; |
|
279 | + foreach ($xml->children() as $child) { |
|
280 | + /** |
|
281 | + * @var \SimpleXMLElement $child |
|
282 | + */ |
|
283 | + switch ($child->getName()) { |
|
284 | + case 'name': |
|
285 | + $name = (string)$child; |
|
286 | + break; |
|
287 | + case 'primary': |
|
288 | + $primary = $this->asBool($child); |
|
289 | + break; |
|
290 | + case 'unique': |
|
291 | + $unique = $this->asBool($child); |
|
292 | + break; |
|
293 | + case 'field': |
|
294 | + foreach ($child->children() as $field) { |
|
295 | + /** |
|
296 | + * @var \SimpleXMLElement $field |
|
297 | + */ |
|
298 | + switch ($field->getName()) { |
|
299 | + case 'name': |
|
300 | + $field_name = (string)$field; |
|
301 | + $field_name = $this->platform->quoteIdentifier($field_name); |
|
302 | + $fields[] = $field_name; |
|
303 | + break; |
|
304 | + case 'sorting': |
|
305 | + break; |
|
306 | + default: |
|
307 | + throw new \DomainException('Unknown element: ' . $field->getName()); |
|
308 | 308 | |
309 | - } |
|
310 | - } |
|
311 | - break; |
|
312 | - default: |
|
313 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
309 | + } |
|
310 | + } |
|
311 | + break; |
|
312 | + default: |
|
313 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
314 | 314 | |
315 | - } |
|
316 | - } |
|
317 | - if (!empty($fields)) { |
|
318 | - if (isset($primary) && $primary) { |
|
319 | - if ($table->hasPrimaryKey()) { |
|
320 | - return; |
|
321 | - } |
|
322 | - $table->setPrimaryKey($fields, $name); |
|
323 | - } else { |
|
324 | - if (isset($unique) && $unique) { |
|
325 | - $table->addUniqueIndex($fields, $name); |
|
326 | - } else { |
|
327 | - $table->addIndex($fields, $name); |
|
328 | - } |
|
329 | - } |
|
330 | - } else { |
|
331 | - throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true)); |
|
332 | - } |
|
333 | - } |
|
315 | + } |
|
316 | + } |
|
317 | + if (!empty($fields)) { |
|
318 | + if (isset($primary) && $primary) { |
|
319 | + if ($table->hasPrimaryKey()) { |
|
320 | + return; |
|
321 | + } |
|
322 | + $table->setPrimaryKey($fields, $name); |
|
323 | + } else { |
|
324 | + if (isset($unique) && $unique) { |
|
325 | + $table->addUniqueIndex($fields, $name); |
|
326 | + } else { |
|
327 | + $table->addIndex($fields, $name); |
|
328 | + } |
|
329 | + } |
|
330 | + } else { |
|
331 | + throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true)); |
|
332 | + } |
|
333 | + } |
|
334 | 334 | |
335 | - /** |
|
336 | - * @param \SimpleXMLElement|string $xml |
|
337 | - * @return bool |
|
338 | - */ |
|
339 | - private function asBool($xml) { |
|
340 | - $result = (string)$xml; |
|
341 | - if ($result == 'true') { |
|
342 | - $result = true; |
|
343 | - } elseif ($result == 'false') { |
|
344 | - $result = false; |
|
345 | - } |
|
346 | - return (bool)$result; |
|
347 | - } |
|
335 | + /** |
|
336 | + * @param \SimpleXMLElement|string $xml |
|
337 | + * @return bool |
|
338 | + */ |
|
339 | + private function asBool($xml) { |
|
340 | + $result = (string)$xml; |
|
341 | + if ($result == 'true') { |
|
342 | + $result = true; |
|
343 | + } elseif ($result == 'false') { |
|
344 | + $result = false; |
|
345 | + } |
|
346 | + return (bool)$result; |
|
347 | + } |
|
348 | 348 | } |