@@ -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 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\DB\QueryBuilder\IParameter; |
26 | 26 | |
27 | 27 | class Parameter implements IParameter { |
28 | - /** @var mixed */ |
|
29 | - protected $name; |
|
28 | + /** @var mixed */ |
|
29 | + protected $name; |
|
30 | 30 | |
31 | - public function __construct($name) { |
|
32 | - $this->name = $name; |
|
33 | - } |
|
31 | + public function __construct($name) { |
|
32 | + $this->name = $name; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function __toString() { |
|
39 | - return (string) $this->name; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function __toString() { |
|
39 | + return (string) $this->name; |
|
40 | + } |
|
41 | 41 | } |
@@ -31,41 +31,41 @@ |
||
31 | 31 | */ |
32 | 32 | class PgSqlTools { |
33 | 33 | |
34 | - /** @var \OCP\IConfig */ |
|
35 | - private $config; |
|
34 | + /** @var \OCP\IConfig */ |
|
35 | + private $config; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @param \OCP\IConfig $config |
|
39 | - */ |
|
40 | - public function __construct(IConfig $config) { |
|
41 | - $this->config = $config; |
|
42 | - } |
|
37 | + /** |
|
38 | + * @param \OCP\IConfig $config |
|
39 | + */ |
|
40 | + public function __construct(IConfig $config) { |
|
41 | + $this->config = $config; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @brief Resynchronizes all sequences of a database after using INSERTs |
|
46 | - * without leaving out the auto-incremented column. |
|
47 | - * @param \OC\DB\Connection $conn |
|
48 | - * @return null |
|
49 | - */ |
|
50 | - public function resynchronizeDatabaseSequences(Connection $conn) { |
|
51 | - $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
|
52 | - $databaseName = $conn->getDatabase(); |
|
53 | - $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression); |
|
44 | + /** |
|
45 | + * @brief Resynchronizes all sequences of a database after using INSERTs |
|
46 | + * without leaving out the auto-incremented column. |
|
47 | + * @param \OC\DB\Connection $conn |
|
48 | + * @return null |
|
49 | + */ |
|
50 | + public function resynchronizeDatabaseSequences(Connection $conn) { |
|
51 | + $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
|
52 | + $databaseName = $conn->getDatabase(); |
|
53 | + $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression); |
|
54 | 54 | |
55 | - foreach ($conn->getSchemaManager()->listSequences() as $sequence) { |
|
56 | - $sequenceName = $sequence->getName(); |
|
57 | - $sqlInfo = 'SELECT table_schema, table_name, column_name |
|
55 | + foreach ($conn->getSchemaManager()->listSequences() as $sequence) { |
|
56 | + $sequenceName = $sequence->getName(); |
|
57 | + $sqlInfo = 'SELECT table_schema, table_name, column_name |
|
58 | 58 | FROM information_schema.columns |
59 | 59 | WHERE column_default = ? AND table_catalog = ?'; |
60 | - $sequenceInfo = $conn->fetchAssoc($sqlInfo, array( |
|
61 | - "nextval('$sequenceName'::regclass)", |
|
62 | - $databaseName |
|
63 | - )); |
|
64 | - $tableName = $sequenceInfo['table_name']; |
|
65 | - $columnName = $sequenceInfo['column_name']; |
|
66 | - $sqlMaxId = "SELECT MAX($columnName) FROM $tableName"; |
|
67 | - $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))"; |
|
68 | - $conn->executeQuery($sqlSetval); |
|
69 | - } |
|
70 | - } |
|
60 | + $sequenceInfo = $conn->fetchAssoc($sqlInfo, array( |
|
61 | + "nextval('$sequenceName'::regclass)", |
|
62 | + $databaseName |
|
63 | + )); |
|
64 | + $tableName = $sequenceInfo['table_name']; |
|
65 | + $columnName = $sequenceInfo['column_name']; |
|
66 | + $sqlMaxId = "SELECT MAX($columnName) FROM $tableName"; |
|
67 | + $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))"; |
|
68 | + $conn->executeQuery($sqlSetval); |
|
69 | + } |
|
70 | + } |
|
71 | 71 | } |
@@ -25,32 +25,32 @@ |
||
25 | 25 | use Doctrine\DBAL\Schema\Schema; |
26 | 26 | |
27 | 27 | class PostgreSqlMigrator extends Migrator { |
28 | - /** |
|
29 | - * @param Schema $targetSchema |
|
30 | - * @param \Doctrine\DBAL\Connection $connection |
|
31 | - * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
32 | - */ |
|
33 | - protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
34 | - $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
28 | + /** |
|
29 | + * @param Schema $targetSchema |
|
30 | + * @param \Doctrine\DBAL\Connection $connection |
|
31 | + * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
32 | + */ |
|
33 | + protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
34 | + $schemaDiff = parent::getDiff($targetSchema, $connection); |
|
35 | 35 | |
36 | - foreach ($schemaDiff->changedTables as $tableDiff) { |
|
37 | - // fix default value in brackets - pg 9.4 is returning a negative default value in () |
|
38 | - // see https://github.com/doctrine/dbal/issues/2427 |
|
39 | - foreach ($tableDiff->changedColumns as $column) { |
|
40 | - $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) { |
|
41 | - if ($changedProperties !== 'default') { |
|
42 | - return true; |
|
43 | - } |
|
44 | - $fromDefault = $column->fromColumn->getDefault(); |
|
45 | - $toDefault = $column->column->getDefault(); |
|
46 | - $fromDefault = trim($fromDefault, "()"); |
|
36 | + foreach ($schemaDiff->changedTables as $tableDiff) { |
|
37 | + // fix default value in brackets - pg 9.4 is returning a negative default value in () |
|
38 | + // see https://github.com/doctrine/dbal/issues/2427 |
|
39 | + foreach ($tableDiff->changedColumns as $column) { |
|
40 | + $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) { |
|
41 | + if ($changedProperties !== 'default') { |
|
42 | + return true; |
|
43 | + } |
|
44 | + $fromDefault = $column->fromColumn->getDefault(); |
|
45 | + $toDefault = $column->column->getDefault(); |
|
46 | + $fromDefault = trim($fromDefault, "()"); |
|
47 | 47 | |
48 | - // by intention usage of != |
|
49 | - return $fromDefault != $toDefault; |
|
50 | - }); |
|
51 | - } |
|
52 | - } |
|
48 | + // by intention usage of != |
|
49 | + return $fromDefault != $toDefault; |
|
50 | + }); |
|
51 | + } |
|
52 | + } |
|
53 | 53 | |
54 | - return $schemaDiff; |
|
55 | - } |
|
54 | + return $schemaDiff; |
|
55 | + } |
|
56 | 56 | } |
@@ -27,31 +27,31 @@ |
||
27 | 27 | |
28 | 28 | class AdapterMySQL extends Adapter { |
29 | 29 | |
30 | - /** @var string */ |
|
31 | - protected $charset; |
|
32 | - |
|
33 | - /** |
|
34 | - * @param string $tableName |
|
35 | - */ |
|
36 | - public function lockTable($tableName) { |
|
37 | - $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE'); |
|
38 | - } |
|
39 | - |
|
40 | - public function unlockTable() { |
|
41 | - $this->conn->executeUpdate('UNLOCK TABLES'); |
|
42 | - } |
|
43 | - |
|
44 | - public function fixupStatement($statement) { |
|
45 | - $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement); |
|
46 | - return $statement; |
|
47 | - } |
|
48 | - |
|
49 | - protected function getCharset() { |
|
50 | - if (!$this->charset) { |
|
51 | - $params = $this->conn->getParams(); |
|
52 | - $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8'; |
|
53 | - } |
|
54 | - |
|
55 | - return $this->charset; |
|
56 | - } |
|
30 | + /** @var string */ |
|
31 | + protected $charset; |
|
32 | + |
|
33 | + /** |
|
34 | + * @param string $tableName |
|
35 | + */ |
|
36 | + public function lockTable($tableName) { |
|
37 | + $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE'); |
|
38 | + } |
|
39 | + |
|
40 | + public function unlockTable() { |
|
41 | + $this->conn->executeUpdate('UNLOCK TABLES'); |
|
42 | + } |
|
43 | + |
|
44 | + public function fixupStatement($statement) { |
|
45 | + $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement); |
|
46 | + return $statement; |
|
47 | + } |
|
48 | + |
|
49 | + protected function getCharset() { |
|
50 | + if (!$this->charset) { |
|
51 | + $params = $this->conn->getParams(); |
|
52 | + $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8'; |
|
53 | + } |
|
54 | + |
|
55 | + return $this->charset; |
|
56 | + } |
|
57 | 57 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | |
26 | 26 | |
27 | 27 | class MigrationException extends \Exception { |
28 | - private $table; |
|
28 | + private $table; |
|
29 | 29 | |
30 | - public function __construct($table, $message) { |
|
31 | - $this->table = $table; |
|
32 | - parent::__construct($message); |
|
33 | - } |
|
30 | + public function __construct($table, $message) { |
|
31 | + $this->table = $table; |
|
32 | + parent::__construct($message); |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function getTable() { |
|
39 | - return $this->table; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function getTable() { |
|
39 | + return $this->table; |
|
40 | + } |
|
41 | 41 | } |
@@ -31,153 +31,153 @@ |
||
31 | 31 | |
32 | 32 | class MDB2SchemaWriter { |
33 | 33 | |
34 | - /** |
|
35 | - * @param string $file |
|
36 | - * @param \OC\DB\Connection $conn |
|
37 | - * @return bool |
|
38 | - */ |
|
39 | - static public function saveSchemaToFile($file, \OC\DB\Connection $conn) { |
|
40 | - $config = \OC::$server->getConfig(); |
|
34 | + /** |
|
35 | + * @param string $file |
|
36 | + * @param \OC\DB\Connection $conn |
|
37 | + * @return bool |
|
38 | + */ |
|
39 | + static public function saveSchemaToFile($file, \OC\DB\Connection $conn) { |
|
40 | + $config = \OC::$server->getConfig(); |
|
41 | 41 | |
42 | - $xml = new \SimpleXMLElement('<database/>'); |
|
43 | - $xml->addChild('name', $config->getSystemValue('dbname', 'owncloud')); |
|
44 | - $xml->addChild('create', 'true'); |
|
45 | - $xml->addChild('overwrite', 'false'); |
|
46 | - if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) { |
|
47 | - $xml->addChild('charset', 'utf8mb4'); |
|
48 | - } else { |
|
49 | - $xml->addChild('charset', 'utf8'); |
|
50 | - } |
|
42 | + $xml = new \SimpleXMLElement('<database/>'); |
|
43 | + $xml->addChild('name', $config->getSystemValue('dbname', 'owncloud')); |
|
44 | + $xml->addChild('create', 'true'); |
|
45 | + $xml->addChild('overwrite', 'false'); |
|
46 | + if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) { |
|
47 | + $xml->addChild('charset', 'utf8mb4'); |
|
48 | + } else { |
|
49 | + $xml->addChild('charset', 'utf8'); |
|
50 | + } |
|
51 | 51 | |
52 | - // FIX ME: bloody work around |
|
53 | - if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') { |
|
54 | - $filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/'; |
|
55 | - } else { |
|
56 | - $filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/'; |
|
57 | - } |
|
58 | - $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression); |
|
52 | + // FIX ME: bloody work around |
|
53 | + if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') { |
|
54 | + $filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/'; |
|
55 | + } else { |
|
56 | + $filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/'; |
|
57 | + } |
|
58 | + $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression); |
|
59 | 59 | |
60 | - foreach ($conn->getSchemaManager()->listTables() as $table) { |
|
61 | - self::saveTable($table, $xml->addChild('table')); |
|
62 | - } |
|
63 | - file_put_contents($file, $xml->asXML()); |
|
64 | - return true; |
|
65 | - } |
|
60 | + foreach ($conn->getSchemaManager()->listTables() as $table) { |
|
61 | + self::saveTable($table, $xml->addChild('table')); |
|
62 | + } |
|
63 | + file_put_contents($file, $xml->asXML()); |
|
64 | + return true; |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
69 | - * @param \SimpleXMLElement $xml |
|
70 | - */ |
|
71 | - private static function saveTable($table, $xml) { |
|
72 | - $xml->addChild('name', $table->getName()); |
|
73 | - $declaration = $xml->addChild('declaration'); |
|
74 | - foreach($table->getColumns() as $column) { |
|
75 | - self::saveColumn($column, $declaration->addChild('field')); |
|
76 | - } |
|
77 | - foreach($table->getIndexes() as $index) { |
|
78 | - if ($index->getName() == 'PRIMARY') { |
|
79 | - $autoincrement = false; |
|
80 | - foreach($index->getColumns() as $column) { |
|
81 | - if ($table->getColumn($column)->getAutoincrement()) { |
|
82 | - $autoincrement = true; |
|
83 | - } |
|
84 | - } |
|
85 | - if ($autoincrement) { |
|
86 | - continue; |
|
87 | - } |
|
88 | - } |
|
89 | - self::saveIndex($index, $declaration->addChild('index')); |
|
90 | - } |
|
91 | - } |
|
67 | + /** |
|
68 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
69 | + * @param \SimpleXMLElement $xml |
|
70 | + */ |
|
71 | + private static function saveTable($table, $xml) { |
|
72 | + $xml->addChild('name', $table->getName()); |
|
73 | + $declaration = $xml->addChild('declaration'); |
|
74 | + foreach($table->getColumns() as $column) { |
|
75 | + self::saveColumn($column, $declaration->addChild('field')); |
|
76 | + } |
|
77 | + foreach($table->getIndexes() as $index) { |
|
78 | + if ($index->getName() == 'PRIMARY') { |
|
79 | + $autoincrement = false; |
|
80 | + foreach($index->getColumns() as $column) { |
|
81 | + if ($table->getColumn($column)->getAutoincrement()) { |
|
82 | + $autoincrement = true; |
|
83 | + } |
|
84 | + } |
|
85 | + if ($autoincrement) { |
|
86 | + continue; |
|
87 | + } |
|
88 | + } |
|
89 | + self::saveIndex($index, $declaration->addChild('index')); |
|
90 | + } |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * @param Column $column |
|
95 | - * @param \SimpleXMLElement $xml |
|
96 | - */ |
|
97 | - private static function saveColumn($column, $xml) { |
|
98 | - $xml->addChild('name', $column->getName()); |
|
99 | - switch($column->getType()) { |
|
100 | - case 'SmallInt': |
|
101 | - case 'Integer': |
|
102 | - case 'BigInt': |
|
103 | - $xml->addChild('type', 'integer'); |
|
104 | - $default = $column->getDefault(); |
|
105 | - if (is_null($default) && $column->getAutoincrement()) { |
|
106 | - $default = '0'; |
|
107 | - } |
|
108 | - $xml->addChild('default', $default); |
|
109 | - $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
110 | - if ($column->getAutoincrement()) { |
|
111 | - $xml->addChild('autoincrement', '1'); |
|
112 | - } |
|
113 | - if ($column->getUnsigned()) { |
|
114 | - $xml->addChild('unsigned', 'true'); |
|
115 | - } |
|
116 | - $length = '4'; |
|
117 | - if ($column->getType() == 'SmallInt') { |
|
118 | - $length = '2'; |
|
119 | - } |
|
120 | - elseif ($column->getType() == 'BigInt') { |
|
121 | - $length = '8'; |
|
122 | - } |
|
123 | - $xml->addChild('length', $length); |
|
124 | - break; |
|
125 | - case 'String': |
|
126 | - $xml->addChild('type', 'text'); |
|
127 | - $default = trim($column->getDefault()); |
|
128 | - if ($default === '') { |
|
129 | - $default = false; |
|
130 | - } |
|
131 | - $xml->addChild('default', $default); |
|
132 | - $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
133 | - $xml->addChild('length', $column->getLength()); |
|
134 | - break; |
|
135 | - case 'Text': |
|
136 | - $xml->addChild('type', 'clob'); |
|
137 | - $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
138 | - break; |
|
139 | - case 'Decimal': |
|
140 | - $xml->addChild('type', 'decimal'); |
|
141 | - $xml->addChild('default', $column->getDefault()); |
|
142 | - $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
143 | - $xml->addChild('length', '15'); |
|
144 | - break; |
|
145 | - case 'Boolean': |
|
146 | - $xml->addChild('type', 'integer'); |
|
147 | - $xml->addChild('default', $column->getDefault()); |
|
148 | - $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
149 | - $xml->addChild('length', '1'); |
|
150 | - break; |
|
151 | - case 'DateTime': |
|
152 | - $xml->addChild('type', 'timestamp'); |
|
153 | - $xml->addChild('default', $column->getDefault()); |
|
154 | - $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
155 | - break; |
|
93 | + /** |
|
94 | + * @param Column $column |
|
95 | + * @param \SimpleXMLElement $xml |
|
96 | + */ |
|
97 | + private static function saveColumn($column, $xml) { |
|
98 | + $xml->addChild('name', $column->getName()); |
|
99 | + switch($column->getType()) { |
|
100 | + case 'SmallInt': |
|
101 | + case 'Integer': |
|
102 | + case 'BigInt': |
|
103 | + $xml->addChild('type', 'integer'); |
|
104 | + $default = $column->getDefault(); |
|
105 | + if (is_null($default) && $column->getAutoincrement()) { |
|
106 | + $default = '0'; |
|
107 | + } |
|
108 | + $xml->addChild('default', $default); |
|
109 | + $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
110 | + if ($column->getAutoincrement()) { |
|
111 | + $xml->addChild('autoincrement', '1'); |
|
112 | + } |
|
113 | + if ($column->getUnsigned()) { |
|
114 | + $xml->addChild('unsigned', 'true'); |
|
115 | + } |
|
116 | + $length = '4'; |
|
117 | + if ($column->getType() == 'SmallInt') { |
|
118 | + $length = '2'; |
|
119 | + } |
|
120 | + elseif ($column->getType() == 'BigInt') { |
|
121 | + $length = '8'; |
|
122 | + } |
|
123 | + $xml->addChild('length', $length); |
|
124 | + break; |
|
125 | + case 'String': |
|
126 | + $xml->addChild('type', 'text'); |
|
127 | + $default = trim($column->getDefault()); |
|
128 | + if ($default === '') { |
|
129 | + $default = false; |
|
130 | + } |
|
131 | + $xml->addChild('default', $default); |
|
132 | + $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
133 | + $xml->addChild('length', $column->getLength()); |
|
134 | + break; |
|
135 | + case 'Text': |
|
136 | + $xml->addChild('type', 'clob'); |
|
137 | + $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
138 | + break; |
|
139 | + case 'Decimal': |
|
140 | + $xml->addChild('type', 'decimal'); |
|
141 | + $xml->addChild('default', $column->getDefault()); |
|
142 | + $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
143 | + $xml->addChild('length', '15'); |
|
144 | + break; |
|
145 | + case 'Boolean': |
|
146 | + $xml->addChild('type', 'integer'); |
|
147 | + $xml->addChild('default', $column->getDefault()); |
|
148 | + $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
149 | + $xml->addChild('length', '1'); |
|
150 | + break; |
|
151 | + case 'DateTime': |
|
152 | + $xml->addChild('type', 'timestamp'); |
|
153 | + $xml->addChild('default', $column->getDefault()); |
|
154 | + $xml->addChild('notnull', self::toBool($column->getNotnull())); |
|
155 | + break; |
|
156 | 156 | |
157 | - } |
|
158 | - } |
|
157 | + } |
|
158 | + } |
|
159 | 159 | |
160 | - /** |
|
161 | - * @param Index $index |
|
162 | - * @param \SimpleXMLElement $xml |
|
163 | - */ |
|
164 | - private static function saveIndex($index, $xml) { |
|
165 | - $xml->addChild('name', $index->getName()); |
|
166 | - if ($index->isPrimary()) { |
|
167 | - $xml->addChild('primary', 'true'); |
|
168 | - } |
|
169 | - elseif ($index->isUnique()) { |
|
170 | - $xml->addChild('unique', 'true'); |
|
171 | - } |
|
172 | - foreach($index->getColumns() as $column) { |
|
173 | - $field = $xml->addChild('field'); |
|
174 | - $field->addChild('name', $column); |
|
175 | - $field->addChild('sorting', 'ascending'); |
|
160 | + /** |
|
161 | + * @param Index $index |
|
162 | + * @param \SimpleXMLElement $xml |
|
163 | + */ |
|
164 | + private static function saveIndex($index, $xml) { |
|
165 | + $xml->addChild('name', $index->getName()); |
|
166 | + if ($index->isPrimary()) { |
|
167 | + $xml->addChild('primary', 'true'); |
|
168 | + } |
|
169 | + elseif ($index->isUnique()) { |
|
170 | + $xml->addChild('unique', 'true'); |
|
171 | + } |
|
172 | + foreach($index->getColumns() as $column) { |
|
173 | + $field = $xml->addChild('field'); |
|
174 | + $field->addChild('name', $column); |
|
175 | + $field->addChild('sorting', 'ascending'); |
|
176 | 176 | |
177 | - } |
|
178 | - } |
|
177 | + } |
|
178 | + } |
|
179 | 179 | |
180 | - private static function toBool($bool) { |
|
181 | - return $bool ? 'true' : 'false'; |
|
182 | - } |
|
180 | + private static function toBool($bool) { |
|
181 | + return $bool ? 'true' : 'false'; |
|
182 | + } |
|
183 | 183 | } |
@@ -32,62 +32,62 @@ |
||
32 | 32 | |
33 | 33 | class SQLiteMigrator extends Migrator { |
34 | 34 | |
35 | - /** |
|
36 | - * @param \Doctrine\DBAL\Schema\Schema $targetSchema |
|
37 | - * @throws \OC\DB\MigrationException |
|
38 | - * |
|
39 | - * For sqlite we simple make a copy of the entire database, and test the migration on that |
|
40 | - */ |
|
41 | - public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) { |
|
42 | - $dbFile = $this->connection->getDatabase(); |
|
43 | - $tmpFile = $this->buildTempDatabase(); |
|
44 | - copy($dbFile, $tmpFile); |
|
35 | + /** |
|
36 | + * @param \Doctrine\DBAL\Schema\Schema $targetSchema |
|
37 | + * @throws \OC\DB\MigrationException |
|
38 | + * |
|
39 | + * For sqlite we simple make a copy of the entire database, and test the migration on that |
|
40 | + */ |
|
41 | + public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) { |
|
42 | + $dbFile = $this->connection->getDatabase(); |
|
43 | + $tmpFile = $this->buildTempDatabase(); |
|
44 | + copy($dbFile, $tmpFile); |
|
45 | 45 | |
46 | - $connectionParams = array( |
|
47 | - 'path' => $tmpFile, |
|
48 | - 'driver' => 'pdo_sqlite', |
|
49 | - ); |
|
50 | - $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams); |
|
51 | - try { |
|
52 | - $this->applySchema($targetSchema, $conn); |
|
53 | - $conn->close(); |
|
54 | - unlink($tmpFile); |
|
55 | - } catch (DBALException $e) { |
|
56 | - $conn->close(); |
|
57 | - unlink($tmpFile); |
|
58 | - throw new MigrationException('', $e->getMessage()); |
|
59 | - } |
|
60 | - } |
|
46 | + $connectionParams = array( |
|
47 | + 'path' => $tmpFile, |
|
48 | + 'driver' => 'pdo_sqlite', |
|
49 | + ); |
|
50 | + $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams); |
|
51 | + try { |
|
52 | + $this->applySchema($targetSchema, $conn); |
|
53 | + $conn->close(); |
|
54 | + unlink($tmpFile); |
|
55 | + } catch (DBALException $e) { |
|
56 | + $conn->close(); |
|
57 | + unlink($tmpFile); |
|
58 | + throw new MigrationException('', $e->getMessage()); |
|
59 | + } |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * @return string |
|
64 | - */ |
|
65 | - private function buildTempDatabase() { |
|
66 | - $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data'); |
|
67 | - $tmpFile = uniqid("oc_"); |
|
68 | - return "$dataDir/$tmpFile.db"; |
|
69 | - } |
|
62 | + /** |
|
63 | + * @return string |
|
64 | + */ |
|
65 | + private function buildTempDatabase() { |
|
66 | + $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data'); |
|
67 | + $tmpFile = uniqid("oc_"); |
|
68 | + return "$dataDir/$tmpFile.db"; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @param Schema $targetSchema |
|
73 | - * @param \Doctrine\DBAL\Connection $connection |
|
74 | - * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
75 | - */ |
|
76 | - protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
77 | - $platform = $connection->getDatabasePlatform(); |
|
78 | - $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer'); |
|
79 | - $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer'); |
|
80 | - $platform->registerDoctrineTypeMapping('varchar ', 'string'); |
|
71 | + /** |
|
72 | + * @param Schema $targetSchema |
|
73 | + * @param \Doctrine\DBAL\Connection $connection |
|
74 | + * @return \Doctrine\DBAL\Schema\SchemaDiff |
|
75 | + */ |
|
76 | + protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) { |
|
77 | + $platform = $connection->getDatabasePlatform(); |
|
78 | + $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer'); |
|
79 | + $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer'); |
|
80 | + $platform->registerDoctrineTypeMapping('varchar ', 'string'); |
|
81 | 81 | |
82 | - // with sqlite autoincrement columns is of type integer |
|
83 | - foreach ($targetSchema->getTables() as $table) { |
|
84 | - foreach ($table->getColumns() as $column) { |
|
85 | - if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) { |
|
86 | - $column->setType(Type::getType('integer')); |
|
87 | - } |
|
88 | - } |
|
89 | - } |
|
82 | + // with sqlite autoincrement columns is of type integer |
|
83 | + foreach ($targetSchema->getTables() as $table) { |
|
84 | + foreach ($table->getColumns() as $column) { |
|
85 | + if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) { |
|
86 | + $column->setType(Type::getType('integer')); |
|
87 | + } |
|
88 | + } |
|
89 | + } |
|
90 | 90 | |
91 | - return parent::getDiff($targetSchema, $connection); |
|
92 | - } |
|
91 | + return parent::getDiff($targetSchema, $connection); |
|
92 | + } |
|
93 | 93 | } |
@@ -22,31 +22,31 @@ |
||
22 | 22 | namespace OC\App\AppStore\Version; |
23 | 23 | |
24 | 24 | class Version { |
25 | - /** @var string */ |
|
26 | - private $minVersion; |
|
27 | - /** @var string */ |
|
28 | - private $maxVersion; |
|
25 | + /** @var string */ |
|
26 | + private $minVersion; |
|
27 | + /** @var string */ |
|
28 | + private $maxVersion; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param string $minVersion |
|
32 | - * @param string $maxVersion |
|
33 | - */ |
|
34 | - public function __construct($minVersion, $maxVersion) { |
|
35 | - $this->minVersion = $minVersion; |
|
36 | - $this->maxVersion = $maxVersion; |
|
37 | - } |
|
30 | + /** |
|
31 | + * @param string $minVersion |
|
32 | + * @param string $maxVersion |
|
33 | + */ |
|
34 | + public function __construct($minVersion, $maxVersion) { |
|
35 | + $this->minVersion = $minVersion; |
|
36 | + $this->maxVersion = $maxVersion; |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @return string |
|
41 | - */ |
|
42 | - public function getMinimumVersion() { |
|
43 | - return $this->minVersion; |
|
44 | - } |
|
39 | + /** |
|
40 | + * @return string |
|
41 | + */ |
|
42 | + public function getMinimumVersion() { |
|
43 | + return $this->minVersion; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * @return string |
|
48 | - */ |
|
49 | - public function getMaximumVersion() { |
|
50 | - return $this->maxVersion; |
|
51 | - } |
|
46 | + /** |
|
47 | + * @return string |
|
48 | + */ |
|
49 | + public function getMaximumVersion() { |
|
50 | + return $this->maxVersion; |
|
51 | + } |
|
52 | 52 | } |