@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $this->loadTable($schema, $child); |
| 95 | 95 | break; |
| 96 | 96 | default: |
| 97 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 97 | + throw new \DomainException('Unknown element: '.$child->getName()); |
|
| 98 | 98 | |
| 99 | 99 | } |
| 100 | 100 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | switch ($child->getName()) { |
| 116 | 116 | case 'name': |
| 117 | - $name = (string)$child; |
|
| 117 | + $name = (string) $child; |
|
| 118 | 118 | $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name); |
| 119 | 119 | $name = $this->platform->quoteIdentifier($name); |
| 120 | 120 | $table = $schema->createTable($name); |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $this->loadDeclaration($table, $child); |
| 133 | 133 | break; |
| 134 | 134 | default: |
| 135 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 135 | + throw new \DomainException('Unknown element: '.$child->getName()); |
|
| 136 | 136 | |
| 137 | 137 | } |
| 138 | 138 | } |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $this->loadIndex($table, $child); |
| 157 | 157 | break; |
| 158 | 158 | default: |
| 159 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 159 | + throw new \DomainException('Unknown element: '.$child->getName()); |
|
| 160 | 160 | |
| 161 | 161 | } |
| 162 | 162 | } |
@@ -168,18 +168,18 @@ discard block |
||
| 168 | 168 | * @throws \DomainException |
| 169 | 169 | */ |
| 170 | 170 | private function loadField($table, $xml) { |
| 171 | - $options = array( 'notnull' => false ); |
|
| 171 | + $options = array('notnull' => false); |
|
| 172 | 172 | foreach ($xml->children() as $child) { |
| 173 | 173 | /** |
| 174 | 174 | * @var \SimpleXMLElement $child |
| 175 | 175 | */ |
| 176 | 176 | switch ($child->getName()) { |
| 177 | 177 | case 'name': |
| 178 | - $name = (string)$child; |
|
| 178 | + $name = (string) $child; |
|
| 179 | 179 | $name = $this->platform->quoteIdentifier($name); |
| 180 | 180 | break; |
| 181 | 181 | case 'type': |
| 182 | - $type = (string)$child; |
|
| 182 | + $type = (string) $child; |
|
| 183 | 183 | switch ($type) { |
| 184 | 184 | case 'text': |
| 185 | 185 | $type = 'string'; |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | } |
| 197 | 197 | break; |
| 198 | 198 | case 'length': |
| 199 | - $length = (string)$child; |
|
| 199 | + $length = (string) $child; |
|
| 200 | 200 | $options['length'] = $length; |
| 201 | 201 | break; |
| 202 | 202 | case 'unsigned': |
@@ -212,11 +212,11 @@ discard block |
||
| 212 | 212 | $options['autoincrement'] = $autoincrement; |
| 213 | 213 | break; |
| 214 | 214 | case 'default': |
| 215 | - $default = (string)$child; |
|
| 215 | + $default = (string) $child; |
|
| 216 | 216 | $options['default'] = $default; |
| 217 | 217 | break; |
| 218 | 218 | case 'comments': |
| 219 | - $comment = (string)$child; |
|
| 219 | + $comment = (string) $child; |
|
| 220 | 220 | $options['comment'] = $comment; |
| 221 | 221 | break; |
| 222 | 222 | case 'primary': |
@@ -224,15 +224,15 @@ discard block |
||
| 224 | 224 | $options['primary'] = $primary; |
| 225 | 225 | break; |
| 226 | 226 | case 'precision': |
| 227 | - $precision = (string)$child; |
|
| 227 | + $precision = (string) $child; |
|
| 228 | 228 | $options['precision'] = $precision; |
| 229 | 229 | break; |
| 230 | 230 | case 'scale': |
| 231 | - $scale = (string)$child; |
|
| 231 | + $scale = (string) $child; |
|
| 232 | 232 | $options['scale'] = $scale; |
| 233 | 233 | break; |
| 234 | 234 | default: |
| 235 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 235 | + throw new \DomainException('Unknown element: '.$child->getName()); |
|
| 236 | 236 | |
| 237 | 237 | } |
| 238 | 238 | } |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | if ($type === 'integer' && isset($options['default'])) { |
| 257 | - $options['default'] = (int)$options['default']; |
|
| 257 | + $options['default'] = (int) $options['default']; |
|
| 258 | 258 | } |
| 259 | 259 | if ($type === 'integer' && isset($options['length'])) { |
| 260 | 260 | $length = $options['length']; |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | switch ($child->getName()) { |
| 295 | 295 | case 'name': |
| 296 | - $name = (string)$child; |
|
| 296 | + $name = (string) $child; |
|
| 297 | 297 | break; |
| 298 | 298 | case 'primary': |
| 299 | 299 | $primary = $this->asBool($child); |
@@ -308,20 +308,20 @@ discard block |
||
| 308 | 308 | */ |
| 309 | 309 | switch ($field->getName()) { |
| 310 | 310 | case 'name': |
| 311 | - $field_name = (string)$field; |
|
| 311 | + $field_name = (string) $field; |
|
| 312 | 312 | $field_name = $this->platform->quoteIdentifier($field_name); |
| 313 | 313 | $fields[] = $field_name; |
| 314 | 314 | break; |
| 315 | 315 | case 'sorting': |
| 316 | 316 | break; |
| 317 | 317 | default: |
| 318 | - throw new \DomainException('Unknown element: ' . $field->getName()); |
|
| 318 | + throw new \DomainException('Unknown element: '.$field->getName()); |
|
| 319 | 319 | |
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | break; |
| 323 | 323 | default: |
| 324 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 324 | + throw new \DomainException('Unknown element: '.$child->getName()); |
|
| 325 | 325 | |
| 326 | 326 | } |
| 327 | 327 | } |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | } else { |
| 342 | - throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true)); |
|
| 342 | + throw new \DomainException('Empty index definition: '.$name.' options:'.print_r($fields, true)); |
|
| 343 | 343 | } |
| 344 | 344 | } |
| 345 | 345 | |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | * @return bool |
| 349 | 349 | */ |
| 350 | 350 | private function asBool($xml) { |
| 351 | - $result = (string)$xml; |
|
| 351 | + $result = (string) $xml; |
|
| 352 | 352 | if ($result == 'true') { |
| 353 | 353 | $result = true; |
| 354 | 354 | } elseif ($result == 'false') { |
| 355 | 355 | $result = false; |
| 356 | 356 | } |
| 357 | - return (bool)$result; |
|
| 357 | + return (bool) $result; |
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | } |
@@ -39,313 +39,313 @@ |
||
| 39 | 39 | |
| 40 | 40 | class MDB2SchemaReader { |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var string $DBTABLEPREFIX |
|
| 44 | - */ |
|
| 45 | - protected $DBTABLEPREFIX; |
|
| 42 | + /** |
|
| 43 | + * @var string $DBTABLEPREFIX |
|
| 44 | + */ |
|
| 45 | + protected $DBTABLEPREFIX; |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
| 49 | - */ |
|
| 50 | - protected $platform; |
|
| 47 | + /** |
|
| 48 | + * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
| 49 | + */ |
|
| 50 | + protected $platform; |
|
| 51 | 51 | |
| 52 | - /** @var IConfig */ |
|
| 53 | - protected $config; |
|
| 52 | + /** @var IConfig */ |
|
| 53 | + protected $config; |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * @param \OCP\IConfig $config |
|
| 57 | - * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
| 58 | - */ |
|
| 59 | - public function __construct(IConfig $config, AbstractPlatform $platform) { |
|
| 60 | - $this->platform = $platform; |
|
| 61 | - $this->config = $config; |
|
| 62 | - $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_'); |
|
| 63 | - } |
|
| 55 | + /** |
|
| 56 | + * @param \OCP\IConfig $config |
|
| 57 | + * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform |
|
| 58 | + */ |
|
| 59 | + public function __construct(IConfig $config, AbstractPlatform $platform) { |
|
| 60 | + $this->platform = $platform; |
|
| 61 | + $this->config = $config; |
|
| 62 | + $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_'); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @param string $file |
|
| 67 | - * @param Schema $schema |
|
| 68 | - * @return Schema |
|
| 69 | - * @throws \DomainException |
|
| 70 | - */ |
|
| 71 | - public function loadSchemaFromFile($file, Schema $schema) { |
|
| 72 | - $loadEntities = libxml_disable_entity_loader(false); |
|
| 73 | - $xml = simplexml_load_file($file); |
|
| 74 | - libxml_disable_entity_loader($loadEntities); |
|
| 75 | - foreach ($xml->children() as $child) { |
|
| 76 | - /** |
|
| 77 | - * @var \SimpleXMLElement $child |
|
| 78 | - */ |
|
| 79 | - switch ($child->getName()) { |
|
| 80 | - case 'name': |
|
| 81 | - case 'create': |
|
| 82 | - case 'overwrite': |
|
| 83 | - case 'charset': |
|
| 84 | - break; |
|
| 85 | - case 'table': |
|
| 86 | - $this->loadTable($schema, $child); |
|
| 87 | - break; |
|
| 88 | - default: |
|
| 89 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 65 | + /** |
|
| 66 | + * @param string $file |
|
| 67 | + * @param Schema $schema |
|
| 68 | + * @return Schema |
|
| 69 | + * @throws \DomainException |
|
| 70 | + */ |
|
| 71 | + public function loadSchemaFromFile($file, Schema $schema) { |
|
| 72 | + $loadEntities = libxml_disable_entity_loader(false); |
|
| 73 | + $xml = simplexml_load_file($file); |
|
| 74 | + libxml_disable_entity_loader($loadEntities); |
|
| 75 | + foreach ($xml->children() as $child) { |
|
| 76 | + /** |
|
| 77 | + * @var \SimpleXMLElement $child |
|
| 78 | + */ |
|
| 79 | + switch ($child->getName()) { |
|
| 80 | + case 'name': |
|
| 81 | + case 'create': |
|
| 82 | + case 'overwrite': |
|
| 83 | + case 'charset': |
|
| 84 | + break; |
|
| 85 | + case 'table': |
|
| 86 | + $this->loadTable($schema, $child); |
|
| 87 | + break; |
|
| 88 | + default: |
|
| 89 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 90 | 90 | |
| 91 | - } |
|
| 92 | - } |
|
| 93 | - return $schema; |
|
| 94 | - } |
|
| 91 | + } |
|
| 92 | + } |
|
| 93 | + return $schema; |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * @param \Doctrine\DBAL\Schema\Schema $schema |
|
| 98 | - * @param \SimpleXMLElement $xml |
|
| 99 | - * @throws \DomainException |
|
| 100 | - */ |
|
| 101 | - private function loadTable($schema, $xml) { |
|
| 102 | - $table = null; |
|
| 103 | - foreach ($xml->children() as $child) { |
|
| 104 | - /** |
|
| 105 | - * @var \SimpleXMLElement $child |
|
| 106 | - */ |
|
| 107 | - switch ($child->getName()) { |
|
| 108 | - case 'name': |
|
| 109 | - $name = (string)$child; |
|
| 110 | - $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name); |
|
| 111 | - $name = $this->platform->quoteIdentifier($name); |
|
| 112 | - $table = $schema->createTable($name); |
|
| 113 | - break; |
|
| 114 | - case 'create': |
|
| 115 | - case 'overwrite': |
|
| 116 | - case 'charset': |
|
| 117 | - break; |
|
| 118 | - case 'declaration': |
|
| 119 | - if (is_null($table)) { |
|
| 120 | - throw new \DomainException('Table declaration before table name'); |
|
| 121 | - } |
|
| 122 | - $this->loadDeclaration($table, $child); |
|
| 123 | - break; |
|
| 124 | - default: |
|
| 125 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 96 | + /** |
|
| 97 | + * @param \Doctrine\DBAL\Schema\Schema $schema |
|
| 98 | + * @param \SimpleXMLElement $xml |
|
| 99 | + * @throws \DomainException |
|
| 100 | + */ |
|
| 101 | + private function loadTable($schema, $xml) { |
|
| 102 | + $table = null; |
|
| 103 | + foreach ($xml->children() as $child) { |
|
| 104 | + /** |
|
| 105 | + * @var \SimpleXMLElement $child |
|
| 106 | + */ |
|
| 107 | + switch ($child->getName()) { |
|
| 108 | + case 'name': |
|
| 109 | + $name = (string)$child; |
|
| 110 | + $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name); |
|
| 111 | + $name = $this->platform->quoteIdentifier($name); |
|
| 112 | + $table = $schema->createTable($name); |
|
| 113 | + break; |
|
| 114 | + case 'create': |
|
| 115 | + case 'overwrite': |
|
| 116 | + case 'charset': |
|
| 117 | + break; |
|
| 118 | + case 'declaration': |
|
| 119 | + if (is_null($table)) { |
|
| 120 | + throw new \DomainException('Table declaration before table name'); |
|
| 121 | + } |
|
| 122 | + $this->loadDeclaration($table, $child); |
|
| 123 | + break; |
|
| 124 | + default: |
|
| 125 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 126 | 126 | |
| 127 | - } |
|
| 128 | - } |
|
| 129 | - } |
|
| 127 | + } |
|
| 128 | + } |
|
| 129 | + } |
|
| 130 | 130 | |
| 131 | - /** |
|
| 132 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
| 133 | - * @param \SimpleXMLElement $xml |
|
| 134 | - * @throws \DomainException |
|
| 135 | - */ |
|
| 136 | - private function loadDeclaration($table, $xml) { |
|
| 137 | - foreach ($xml->children() as $child) { |
|
| 138 | - /** |
|
| 139 | - * @var \SimpleXMLElement $child |
|
| 140 | - */ |
|
| 141 | - switch ($child->getName()) { |
|
| 142 | - case 'field': |
|
| 143 | - $this->loadField($table, $child); |
|
| 144 | - break; |
|
| 145 | - case 'index': |
|
| 146 | - $this->loadIndex($table, $child); |
|
| 147 | - break; |
|
| 148 | - default: |
|
| 149 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 131 | + /** |
|
| 132 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
| 133 | + * @param \SimpleXMLElement $xml |
|
| 134 | + * @throws \DomainException |
|
| 135 | + */ |
|
| 136 | + private function loadDeclaration($table, $xml) { |
|
| 137 | + foreach ($xml->children() as $child) { |
|
| 138 | + /** |
|
| 139 | + * @var \SimpleXMLElement $child |
|
| 140 | + */ |
|
| 141 | + switch ($child->getName()) { |
|
| 142 | + case 'field': |
|
| 143 | + $this->loadField($table, $child); |
|
| 144 | + break; |
|
| 145 | + case 'index': |
|
| 146 | + $this->loadIndex($table, $child); |
|
| 147 | + break; |
|
| 148 | + default: |
|
| 149 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 150 | 150 | |
| 151 | - } |
|
| 152 | - } |
|
| 153 | - } |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | + } |
|
| 154 | 154 | |
| 155 | - /** |
|
| 156 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
| 157 | - * @param \SimpleXMLElement $xml |
|
| 158 | - * @throws \DomainException |
|
| 159 | - */ |
|
| 160 | - private function loadField($table, $xml) { |
|
| 161 | - $options = array( 'notnull' => false ); |
|
| 162 | - foreach ($xml->children() as $child) { |
|
| 163 | - /** |
|
| 164 | - * @var \SimpleXMLElement $child |
|
| 165 | - */ |
|
| 166 | - switch ($child->getName()) { |
|
| 167 | - case 'name': |
|
| 168 | - $name = (string)$child; |
|
| 169 | - $name = $this->platform->quoteIdentifier($name); |
|
| 170 | - break; |
|
| 171 | - case 'type': |
|
| 172 | - $type = (string)$child; |
|
| 173 | - switch ($type) { |
|
| 174 | - case 'text': |
|
| 175 | - $type = 'string'; |
|
| 176 | - break; |
|
| 177 | - case 'clob': |
|
| 178 | - $type = 'text'; |
|
| 179 | - break; |
|
| 180 | - case 'timestamp': |
|
| 181 | - $type = 'datetime'; |
|
| 182 | - break; |
|
| 183 | - case 'numeric': |
|
| 184 | - $type = 'decimal'; |
|
| 185 | - break; |
|
| 186 | - } |
|
| 187 | - break; |
|
| 188 | - case 'length': |
|
| 189 | - $length = (string)$child; |
|
| 190 | - $options['length'] = $length; |
|
| 191 | - break; |
|
| 192 | - case 'unsigned': |
|
| 193 | - $unsigned = $this->asBool($child); |
|
| 194 | - $options['unsigned'] = $unsigned; |
|
| 195 | - break; |
|
| 196 | - case 'notnull': |
|
| 197 | - $notnull = $this->asBool($child); |
|
| 198 | - $options['notnull'] = $notnull; |
|
| 199 | - break; |
|
| 200 | - case 'autoincrement': |
|
| 201 | - $autoincrement = $this->asBool($child); |
|
| 202 | - $options['autoincrement'] = $autoincrement; |
|
| 203 | - break; |
|
| 204 | - case 'default': |
|
| 205 | - $default = (string)$child; |
|
| 206 | - $options['default'] = $default; |
|
| 207 | - break; |
|
| 208 | - case 'comments': |
|
| 209 | - $comment = (string)$child; |
|
| 210 | - $options['comment'] = $comment; |
|
| 211 | - break; |
|
| 212 | - case 'primary': |
|
| 213 | - $primary = $this->asBool($child); |
|
| 214 | - $options['primary'] = $primary; |
|
| 215 | - break; |
|
| 216 | - case 'precision': |
|
| 217 | - $precision = (string)$child; |
|
| 218 | - $options['precision'] = $precision; |
|
| 219 | - break; |
|
| 220 | - case 'scale': |
|
| 221 | - $scale = (string)$child; |
|
| 222 | - $options['scale'] = $scale; |
|
| 223 | - break; |
|
| 224 | - default: |
|
| 225 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 155 | + /** |
|
| 156 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
| 157 | + * @param \SimpleXMLElement $xml |
|
| 158 | + * @throws \DomainException |
|
| 159 | + */ |
|
| 160 | + private function loadField($table, $xml) { |
|
| 161 | + $options = array( 'notnull' => false ); |
|
| 162 | + foreach ($xml->children() as $child) { |
|
| 163 | + /** |
|
| 164 | + * @var \SimpleXMLElement $child |
|
| 165 | + */ |
|
| 166 | + switch ($child->getName()) { |
|
| 167 | + case 'name': |
|
| 168 | + $name = (string)$child; |
|
| 169 | + $name = $this->platform->quoteIdentifier($name); |
|
| 170 | + break; |
|
| 171 | + case 'type': |
|
| 172 | + $type = (string)$child; |
|
| 173 | + switch ($type) { |
|
| 174 | + case 'text': |
|
| 175 | + $type = 'string'; |
|
| 176 | + break; |
|
| 177 | + case 'clob': |
|
| 178 | + $type = 'text'; |
|
| 179 | + break; |
|
| 180 | + case 'timestamp': |
|
| 181 | + $type = 'datetime'; |
|
| 182 | + break; |
|
| 183 | + case 'numeric': |
|
| 184 | + $type = 'decimal'; |
|
| 185 | + break; |
|
| 186 | + } |
|
| 187 | + break; |
|
| 188 | + case 'length': |
|
| 189 | + $length = (string)$child; |
|
| 190 | + $options['length'] = $length; |
|
| 191 | + break; |
|
| 192 | + case 'unsigned': |
|
| 193 | + $unsigned = $this->asBool($child); |
|
| 194 | + $options['unsigned'] = $unsigned; |
|
| 195 | + break; |
|
| 196 | + case 'notnull': |
|
| 197 | + $notnull = $this->asBool($child); |
|
| 198 | + $options['notnull'] = $notnull; |
|
| 199 | + break; |
|
| 200 | + case 'autoincrement': |
|
| 201 | + $autoincrement = $this->asBool($child); |
|
| 202 | + $options['autoincrement'] = $autoincrement; |
|
| 203 | + break; |
|
| 204 | + case 'default': |
|
| 205 | + $default = (string)$child; |
|
| 206 | + $options['default'] = $default; |
|
| 207 | + break; |
|
| 208 | + case 'comments': |
|
| 209 | + $comment = (string)$child; |
|
| 210 | + $options['comment'] = $comment; |
|
| 211 | + break; |
|
| 212 | + case 'primary': |
|
| 213 | + $primary = $this->asBool($child); |
|
| 214 | + $options['primary'] = $primary; |
|
| 215 | + break; |
|
| 216 | + case 'precision': |
|
| 217 | + $precision = (string)$child; |
|
| 218 | + $options['precision'] = $precision; |
|
| 219 | + break; |
|
| 220 | + case 'scale': |
|
| 221 | + $scale = (string)$child; |
|
| 222 | + $options['scale'] = $scale; |
|
| 223 | + break; |
|
| 224 | + default: |
|
| 225 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 226 | 226 | |
| 227 | - } |
|
| 228 | - } |
|
| 229 | - if (isset($name) && isset($type)) { |
|
| 230 | - if (isset($options['default']) && empty($options['default'])) { |
|
| 231 | - if (empty($options['notnull']) || !$options['notnull']) { |
|
| 232 | - unset($options['default']); |
|
| 233 | - $options['notnull'] = false; |
|
| 234 | - } else { |
|
| 235 | - $options['default'] = ''; |
|
| 236 | - } |
|
| 237 | - if ($type == 'integer' || $type == 'decimal') { |
|
| 238 | - $options['default'] = 0; |
|
| 239 | - } elseif ($type == 'boolean') { |
|
| 240 | - $options['default'] = false; |
|
| 241 | - } |
|
| 242 | - if (!empty($options['autoincrement']) && $options['autoincrement']) { |
|
| 243 | - unset($options['default']); |
|
| 244 | - } |
|
| 245 | - } |
|
| 246 | - if ($type === 'integer' && isset($options['default'])) { |
|
| 247 | - $options['default'] = (int)$options['default']; |
|
| 248 | - } |
|
| 249 | - if ($type === 'integer' && isset($options['length'])) { |
|
| 250 | - $length = $options['length']; |
|
| 251 | - if ($length < 4) { |
|
| 252 | - $type = 'smallint'; |
|
| 253 | - } else if ($length > 4) { |
|
| 254 | - $type = 'bigint'; |
|
| 255 | - } |
|
| 256 | - } |
|
| 257 | - if ($type === 'boolean' && isset($options['default'])) { |
|
| 258 | - $options['default'] = $this->asBool($options['default']); |
|
| 259 | - } |
|
| 260 | - if (!empty($options['autoincrement']) |
|
| 261 | - && !empty($options['notnull']) |
|
| 262 | - ) { |
|
| 263 | - $options['primary'] = true; |
|
| 264 | - } |
|
| 227 | + } |
|
| 228 | + } |
|
| 229 | + if (isset($name) && isset($type)) { |
|
| 230 | + if (isset($options['default']) && empty($options['default'])) { |
|
| 231 | + if (empty($options['notnull']) || !$options['notnull']) { |
|
| 232 | + unset($options['default']); |
|
| 233 | + $options['notnull'] = false; |
|
| 234 | + } else { |
|
| 235 | + $options['default'] = ''; |
|
| 236 | + } |
|
| 237 | + if ($type == 'integer' || $type == 'decimal') { |
|
| 238 | + $options['default'] = 0; |
|
| 239 | + } elseif ($type == 'boolean') { |
|
| 240 | + $options['default'] = false; |
|
| 241 | + } |
|
| 242 | + if (!empty($options['autoincrement']) && $options['autoincrement']) { |
|
| 243 | + unset($options['default']); |
|
| 244 | + } |
|
| 245 | + } |
|
| 246 | + if ($type === 'integer' && isset($options['default'])) { |
|
| 247 | + $options['default'] = (int)$options['default']; |
|
| 248 | + } |
|
| 249 | + if ($type === 'integer' && isset($options['length'])) { |
|
| 250 | + $length = $options['length']; |
|
| 251 | + if ($length < 4) { |
|
| 252 | + $type = 'smallint'; |
|
| 253 | + } else if ($length > 4) { |
|
| 254 | + $type = 'bigint'; |
|
| 255 | + } |
|
| 256 | + } |
|
| 257 | + if ($type === 'boolean' && isset($options['default'])) { |
|
| 258 | + $options['default'] = $this->asBool($options['default']); |
|
| 259 | + } |
|
| 260 | + if (!empty($options['autoincrement']) |
|
| 261 | + && !empty($options['notnull']) |
|
| 262 | + ) { |
|
| 263 | + $options['primary'] = true; |
|
| 264 | + } |
|
| 265 | 265 | |
| 266 | - $table->addColumn($name, $type, $options); |
|
| 267 | - if (!empty($options['primary']) && $options['primary']) { |
|
| 268 | - $table->setPrimaryKey(array($name)); |
|
| 269 | - } |
|
| 270 | - } |
|
| 271 | - } |
|
| 266 | + $table->addColumn($name, $type, $options); |
|
| 267 | + if (!empty($options['primary']) && $options['primary']) { |
|
| 268 | + $table->setPrimaryKey(array($name)); |
|
| 269 | + } |
|
| 270 | + } |
|
| 271 | + } |
|
| 272 | 272 | |
| 273 | - /** |
|
| 274 | - * @param \Doctrine\DBAL\Schema\Table $table |
|
| 275 | - * @param \SimpleXMLElement $xml |
|
| 276 | - * @throws \DomainException |
|
| 277 | - */ |
|
| 278 | - private function loadIndex($table, $xml) { |
|
| 279 | - $name = null; |
|
| 280 | - $fields = array(); |
|
| 281 | - foreach ($xml->children() as $child) { |
|
| 282 | - /** |
|
| 283 | - * @var \SimpleXMLElement $child |
|
| 284 | - */ |
|
| 285 | - switch ($child->getName()) { |
|
| 286 | - case 'name': |
|
| 287 | - $name = (string)$child; |
|
| 288 | - break; |
|
| 289 | - case 'primary': |
|
| 290 | - $primary = $this->asBool($child); |
|
| 291 | - break; |
|
| 292 | - case 'unique': |
|
| 293 | - $unique = $this->asBool($child); |
|
| 294 | - break; |
|
| 295 | - case 'field': |
|
| 296 | - foreach ($child->children() as $field) { |
|
| 297 | - /** |
|
| 298 | - * @var \SimpleXMLElement $field |
|
| 299 | - */ |
|
| 300 | - switch ($field->getName()) { |
|
| 301 | - case 'name': |
|
| 302 | - $field_name = (string)$field; |
|
| 303 | - $field_name = $this->platform->quoteIdentifier($field_name); |
|
| 304 | - $fields[] = $field_name; |
|
| 305 | - break; |
|
| 306 | - case 'sorting': |
|
| 307 | - break; |
|
| 308 | - default: |
|
| 309 | - throw new \DomainException('Unknown element: ' . $field->getName()); |
|
| 273 | + /** |
|
| 274 | + * @param \Doctrine\DBAL\Schema\Table $table |
|
| 275 | + * @param \SimpleXMLElement $xml |
|
| 276 | + * @throws \DomainException |
|
| 277 | + */ |
|
| 278 | + private function loadIndex($table, $xml) { |
|
| 279 | + $name = null; |
|
| 280 | + $fields = array(); |
|
| 281 | + foreach ($xml->children() as $child) { |
|
| 282 | + /** |
|
| 283 | + * @var \SimpleXMLElement $child |
|
| 284 | + */ |
|
| 285 | + switch ($child->getName()) { |
|
| 286 | + case 'name': |
|
| 287 | + $name = (string)$child; |
|
| 288 | + break; |
|
| 289 | + case 'primary': |
|
| 290 | + $primary = $this->asBool($child); |
|
| 291 | + break; |
|
| 292 | + case 'unique': |
|
| 293 | + $unique = $this->asBool($child); |
|
| 294 | + break; |
|
| 295 | + case 'field': |
|
| 296 | + foreach ($child->children() as $field) { |
|
| 297 | + /** |
|
| 298 | + * @var \SimpleXMLElement $field |
|
| 299 | + */ |
|
| 300 | + switch ($field->getName()) { |
|
| 301 | + case 'name': |
|
| 302 | + $field_name = (string)$field; |
|
| 303 | + $field_name = $this->platform->quoteIdentifier($field_name); |
|
| 304 | + $fields[] = $field_name; |
|
| 305 | + break; |
|
| 306 | + case 'sorting': |
|
| 307 | + break; |
|
| 308 | + default: |
|
| 309 | + throw new \DomainException('Unknown element: ' . $field->getName()); |
|
| 310 | 310 | |
| 311 | - } |
|
| 312 | - } |
|
| 313 | - break; |
|
| 314 | - default: |
|
| 315 | - throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 311 | + } |
|
| 312 | + } |
|
| 313 | + break; |
|
| 314 | + default: |
|
| 315 | + throw new \DomainException('Unknown element: ' . $child->getName()); |
|
| 316 | 316 | |
| 317 | - } |
|
| 318 | - } |
|
| 319 | - if (!empty($fields)) { |
|
| 320 | - if (isset($primary) && $primary) { |
|
| 321 | - if ($table->hasPrimaryKey()) { |
|
| 322 | - return; |
|
| 323 | - } |
|
| 324 | - $table->setPrimaryKey($fields, $name); |
|
| 325 | - } else { |
|
| 326 | - if (isset($unique) && $unique) { |
|
| 327 | - $table->addUniqueIndex($fields, $name); |
|
| 328 | - } else { |
|
| 329 | - $table->addIndex($fields, $name); |
|
| 330 | - } |
|
| 331 | - } |
|
| 332 | - } else { |
|
| 333 | - throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true)); |
|
| 334 | - } |
|
| 335 | - } |
|
| 317 | + } |
|
| 318 | + } |
|
| 319 | + if (!empty($fields)) { |
|
| 320 | + if (isset($primary) && $primary) { |
|
| 321 | + if ($table->hasPrimaryKey()) { |
|
| 322 | + return; |
|
| 323 | + } |
|
| 324 | + $table->setPrimaryKey($fields, $name); |
|
| 325 | + } else { |
|
| 326 | + if (isset($unique) && $unique) { |
|
| 327 | + $table->addUniqueIndex($fields, $name); |
|
| 328 | + } else { |
|
| 329 | + $table->addIndex($fields, $name); |
|
| 330 | + } |
|
| 331 | + } |
|
| 332 | + } else { |
|
| 333 | + throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true)); |
|
| 334 | + } |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | - /** |
|
| 338 | - * @param \SimpleXMLElement|string $xml |
|
| 339 | - * @return bool |
|
| 340 | - */ |
|
| 341 | - private function asBool($xml) { |
|
| 342 | - $result = (string)$xml; |
|
| 343 | - if ($result == 'true') { |
|
| 344 | - $result = true; |
|
| 345 | - } elseif ($result == 'false') { |
|
| 346 | - $result = false; |
|
| 347 | - } |
|
| 348 | - return (bool)$result; |
|
| 349 | - } |
|
| 337 | + /** |
|
| 338 | + * @param \SimpleXMLElement|string $xml |
|
| 339 | + * @return bool |
|
| 340 | + */ |
|
| 341 | + private function asBool($xml) { |
|
| 342 | + $result = (string)$xml; |
|
| 343 | + if ($result == 'true') { |
|
| 344 | + $result = true; |
|
| 345 | + } elseif ($result == 'false') { |
|
| 346 | + $result = false; |
|
| 347 | + } |
|
| 348 | + return (bool)$result; |
|
| 349 | + } |
|
| 350 | 350 | |
| 351 | 351 | } |
@@ -28,76 +28,76 @@ |
||
| 28 | 28 | |
| 29 | 29 | class LinkAction implements ILinkAction { |
| 30 | 30 | |
| 31 | - /** @var string */ |
|
| 32 | - private $icon; |
|
| 33 | - |
|
| 34 | - /** @var string */ |
|
| 35 | - private $name; |
|
| 36 | - |
|
| 37 | - /** @var string */ |
|
| 38 | - private $href; |
|
| 39 | - |
|
| 40 | - /** @var int */ |
|
| 41 | - private $priority = 10; |
|
| 42 | - |
|
| 43 | - /** |
|
| 44 | - * @param string $icon absolute URI to an icon |
|
| 45 | - */ |
|
| 46 | - public function setIcon($icon) { |
|
| 47 | - $this->icon = $icon; |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * @param string $name |
|
| 52 | - */ |
|
| 53 | - public function setName($name) { |
|
| 54 | - $this->name = $name; |
|
| 55 | - } |
|
| 56 | - |
|
| 57 | - /** |
|
| 58 | - * @return string |
|
| 59 | - */ |
|
| 60 | - public function getName() { |
|
| 61 | - return $this->name; |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * @param int $priority |
|
| 66 | - */ |
|
| 67 | - public function setPriority($priority) { |
|
| 68 | - $this->priority = $priority; |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - /** |
|
| 72 | - * @return int |
|
| 73 | - */ |
|
| 74 | - public function getPriority() { |
|
| 75 | - return $this->priority; |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - /** |
|
| 79 | - * @param string $href |
|
| 80 | - */ |
|
| 81 | - public function setHref($href) { |
|
| 82 | - $this->href = $href; |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - /** |
|
| 86 | - * @return string |
|
| 87 | - */ |
|
| 88 | - public function getHref() { |
|
| 89 | - return $this->href; |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - /** |
|
| 93 | - * @return array |
|
| 94 | - */ |
|
| 95 | - public function jsonSerialize() { |
|
| 96 | - return [ |
|
| 97 | - 'title' => $this->name, |
|
| 98 | - 'icon' => $this->icon, |
|
| 99 | - 'hyperlink' => $this->href, |
|
| 100 | - ]; |
|
| 101 | - } |
|
| 31 | + /** @var string */ |
|
| 32 | + private $icon; |
|
| 33 | + |
|
| 34 | + /** @var string */ |
|
| 35 | + private $name; |
|
| 36 | + |
|
| 37 | + /** @var string */ |
|
| 38 | + private $href; |
|
| 39 | + |
|
| 40 | + /** @var int */ |
|
| 41 | + private $priority = 10; |
|
| 42 | + |
|
| 43 | + /** |
|
| 44 | + * @param string $icon absolute URI to an icon |
|
| 45 | + */ |
|
| 46 | + public function setIcon($icon) { |
|
| 47 | + $this->icon = $icon; |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * @param string $name |
|
| 52 | + */ |
|
| 53 | + public function setName($name) { |
|
| 54 | + $this->name = $name; |
|
| 55 | + } |
|
| 56 | + |
|
| 57 | + /** |
|
| 58 | + * @return string |
|
| 59 | + */ |
|
| 60 | + public function getName() { |
|
| 61 | + return $this->name; |
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * @param int $priority |
|
| 66 | + */ |
|
| 67 | + public function setPriority($priority) { |
|
| 68 | + $this->priority = $priority; |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + /** |
|
| 72 | + * @return int |
|
| 73 | + */ |
|
| 74 | + public function getPriority() { |
|
| 75 | + return $this->priority; |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + /** |
|
| 79 | + * @param string $href |
|
| 80 | + */ |
|
| 81 | + public function setHref($href) { |
|
| 82 | + $this->href = $href; |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + /** |
|
| 86 | + * @return string |
|
| 87 | + */ |
|
| 88 | + public function getHref() { |
|
| 89 | + return $this->href; |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + /** |
|
| 93 | + * @return array |
|
| 94 | + */ |
|
| 95 | + public function jsonSerialize() { |
|
| 96 | + return [ |
|
| 97 | + 'title' => $this->name, |
|
| 98 | + 'icon' => $this->icon, |
|
| 99 | + 'hyperlink' => $this->href, |
|
| 100 | + ]; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | } |
@@ -33,33 +33,33 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | interface IAction extends JsonSerializable { |
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @param string $icon absolute URI to an icon |
|
| 38 | - * @since 12.0 |
|
| 39 | - */ |
|
| 40 | - public function setIcon($icon); |
|
| 36 | + /** |
|
| 37 | + * @param string $icon absolute URI to an icon |
|
| 38 | + * @since 12.0 |
|
| 39 | + */ |
|
| 40 | + public function setIcon($icon); |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @return string localized action name, e.g. 'Call' |
|
| 44 | - * @since 12.0 |
|
| 45 | - */ |
|
| 46 | - public function getName(); |
|
| 42 | + /** |
|
| 43 | + * @return string localized action name, e.g. 'Call' |
|
| 44 | + * @since 12.0 |
|
| 45 | + */ |
|
| 46 | + public function getName(); |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * @param string $name localized action name, e.g. 'Call' |
|
| 50 | - * @since 12.0 |
|
| 51 | - */ |
|
| 52 | - public function setName($name); |
|
| 48 | + /** |
|
| 49 | + * @param string $name localized action name, e.g. 'Call' |
|
| 50 | + * @since 12.0 |
|
| 51 | + */ |
|
| 52 | + public function setName($name); |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @param int $priority priorize actions, high order ones are shown on top |
|
| 56 | - * @since 12.0 |
|
| 57 | - */ |
|
| 58 | - public function setPriority($priority); |
|
| 54 | + /** |
|
| 55 | + * @param int $priority priorize actions, high order ones are shown on top |
|
| 56 | + * @since 12.0 |
|
| 57 | + */ |
|
| 58 | + public function setPriority($priority); |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * @return int priority to priorize actions, high order ones are shown on top |
|
| 62 | - * @since 12.0 |
|
| 63 | - */ |
|
| 64 | - public function getPriority(); |
|
| 60 | + /** |
|
| 61 | + * @return int priority to priorize actions, high order ones are shown on top |
|
| 62 | + * @since 12.0 |
|
| 63 | + */ |
|
| 64 | + public function getPriority(); |
|
| 65 | 65 | } |
@@ -28,27 +28,27 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | interface IActionFactory { |
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Construct and return a new link action for the contacts menu |
|
| 33 | - * |
|
| 34 | - * @since 12.0 |
|
| 35 | - * |
|
| 36 | - * @param string $icon full path to the action's icon |
|
| 37 | - * @param string $name localized name of the action |
|
| 38 | - * @param string $href target URL |
|
| 39 | - * @return ILinkAction |
|
| 40 | - */ |
|
| 41 | - public function newLinkAction($icon, $name, $href); |
|
| 31 | + /** |
|
| 32 | + * Construct and return a new link action for the contacts menu |
|
| 33 | + * |
|
| 34 | + * @since 12.0 |
|
| 35 | + * |
|
| 36 | + * @param string $icon full path to the action's icon |
|
| 37 | + * @param string $name localized name of the action |
|
| 38 | + * @param string $href target URL |
|
| 39 | + * @return ILinkAction |
|
| 40 | + */ |
|
| 41 | + public function newLinkAction($icon, $name, $href); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Construct and return a new email action for the contacts menu |
|
| 45 | - * |
|
| 46 | - * @since 12.0 |
|
| 47 | - * |
|
| 48 | - * @param string $icon full path to the action's icon |
|
| 49 | - * @param string $name localized name of the action |
|
| 50 | - * @param string $email target e-mail address |
|
| 51 | - * @return ILinkAction |
|
| 52 | - */ |
|
| 53 | - public function newEMailAction($icon, $name, $email); |
|
| 43 | + /** |
|
| 44 | + * Construct and return a new email action for the contacts menu |
|
| 45 | + * |
|
| 46 | + * @since 12.0 |
|
| 47 | + * |
|
| 48 | + * @param string $icon full path to the action's icon |
|
| 49 | + * @param string $name localized name of the action |
|
| 50 | + * @param string $email target e-mail address |
|
| 51 | + * @return ILinkAction |
|
| 52 | + */ |
|
| 53 | + public function newEMailAction($icon, $name, $email); |
|
| 54 | 54 | } |
@@ -29,15 +29,15 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | interface ILinkAction extends IAction { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @since 12.0 |
|
| 34 | - * @param string $href the target URL of the action |
|
| 35 | - */ |
|
| 36 | - public function setHref($href); |
|
| 32 | + /** |
|
| 33 | + * @since 12.0 |
|
| 34 | + * @param string $href the target URL of the action |
|
| 35 | + */ |
|
| 36 | + public function setHref($href); |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @since 12.0 |
|
| 40 | - * @return string |
|
| 41 | - */ |
|
| 42 | - public function getHref(); |
|
| 38 | + /** |
|
| 39 | + * @since 12.0 |
|
| 40 | + * @return string |
|
| 41 | + */ |
|
| 42 | + public function getHref(); |
|
| 43 | 43 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | use OC\DB\QueryBuilder\QueryFunction; |
| 25 | 25 | |
| 26 | 26 | class OCIFunctionBuilder extends FunctionBuilder { |
| 27 | - public function md5($input) { |
|
| 28 | - return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))'); |
|
| 29 | - } |
|
| 27 | + public function md5($input) { |
|
| 28 | + return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))'); |
|
| 29 | + } |
|
| 30 | 30 | } |
@@ -25,6 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | class OCIFunctionBuilder extends FunctionBuilder { |
| 27 | 27 | public function md5($input) { |
| 28 | - return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))'); |
|
| 28 | + return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw('.$this->helper->quoteColumnName($input).')))'); |
|
| 29 | 29 | } |
| 30 | 30 | } |
@@ -42,10 +42,10 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function fixupStatement($statement) { |
| 44 | 44 | $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement); |
| 45 | - $statement = str_replace( '`', '"', $statement ); |
|
| 46 | - $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); |
|
| 45 | + $statement = str_replace('`', '"', $statement); |
|
| 46 | + $statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement); |
|
| 47 | 47 | $statement = str_ireplace('GREATEST(', 'MAX(', $statement); |
| 48 | - $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); |
|
| 48 | + $statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement); |
|
| 49 | 49 | return $statement; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | if (empty($compare)) { |
| 65 | 65 | $compare = array_keys($input); |
| 66 | 66 | } |
| 67 | - $fieldList = '`' . implode('`,`', array_keys($input)) . '`'; |
|
| 67 | + $fieldList = '`'.implode('`,`', array_keys($input)).'`'; |
|
| 68 | 68 | $query = "INSERT INTO `$table` ($fieldList) SELECT " |
| 69 | - . str_repeat('?,', count($input)-1).'? ' |
|
| 69 | + . str_repeat('?,', count($input) - 1).'? ' |
|
| 70 | 70 | . " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE "; |
| 71 | 71 | |
| 72 | 72 | $inserts = array_values($input); |
| 73 | - foreach($compare as $key) { |
|
| 74 | - $query .= '`' . $key . '`'; |
|
| 73 | + foreach ($compare as $key) { |
|
| 74 | + $query .= '`'.$key.'`'; |
|
| 75 | 75 | if (is_null($input[$key])) { |
| 76 | 76 | $query .= ' IS NULL AND '; |
| 77 | 77 | } else { |
@@ -31,70 +31,70 @@ |
||
| 31 | 31 | |
| 32 | 32 | class AdapterSqlite extends Adapter { |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @param string $tableName |
|
| 36 | - */ |
|
| 37 | - public function lockTable($tableName) { |
|
| 38 | - $this->conn->executeUpdate('BEGIN EXCLUSIVE TRANSACTION'); |
|
| 39 | - } |
|
| 34 | + /** |
|
| 35 | + * @param string $tableName |
|
| 36 | + */ |
|
| 37 | + public function lockTable($tableName) { |
|
| 38 | + $this->conn->executeUpdate('BEGIN EXCLUSIVE TRANSACTION'); |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - public function unlockTable() { |
|
| 42 | - $this->conn->executeUpdate('COMMIT TRANSACTION'); |
|
| 43 | - } |
|
| 41 | + public function unlockTable() { |
|
| 42 | + $this->conn->executeUpdate('COMMIT TRANSACTION'); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - public function fixupStatement($statement) { |
|
| 46 | - $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement); |
|
| 47 | - $statement = str_replace( '`', '"', $statement ); |
|
| 48 | - $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); |
|
| 49 | - $statement = str_ireplace('GREATEST(', 'MAX(', $statement); |
|
| 50 | - $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); |
|
| 51 | - return $statement; |
|
| 52 | - } |
|
| 45 | + public function fixupStatement($statement) { |
|
| 46 | + $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement); |
|
| 47 | + $statement = str_replace( '`', '"', $statement ); |
|
| 48 | + $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); |
|
| 49 | + $statement = str_ireplace('GREATEST(', 'MAX(', $statement); |
|
| 50 | + $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); |
|
| 51 | + return $statement; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance |
|
| 56 | - * it is needed that there is also a unique constraint on the values. Then this method will |
|
| 57 | - * catch the exception and return 0. |
|
| 58 | - * |
|
| 59 | - * @param string $table The table name (will replace *PREFIX* with the actual prefix) |
|
| 60 | - * @param array $input data that should be inserted into the table (column name => value) |
|
| 61 | - * @param array|null $compare List of values that should be checked for "if not exists" |
|
| 62 | - * If this is null or an empty array, all keys of $input will be compared |
|
| 63 | - * Please note: text fields (clob) must not be used in the compare array |
|
| 64 | - * @return int number of inserted rows |
|
| 65 | - * @throws \Doctrine\DBAL\DBALException |
|
| 66 | - * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371 |
|
| 67 | - */ |
|
| 68 | - public function insertIfNotExist($table, $input, array $compare = null) { |
|
| 69 | - if (empty($compare)) { |
|
| 70 | - $compare = array_keys($input); |
|
| 71 | - } |
|
| 72 | - $fieldList = '`' . implode('`,`', array_keys($input)) . '`'; |
|
| 73 | - $query = "INSERT INTO `$table` ($fieldList) SELECT " |
|
| 74 | - . str_repeat('?,', count($input)-1).'? ' |
|
| 75 | - . " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE "; |
|
| 54 | + /** |
|
| 55 | + * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance |
|
| 56 | + * it is needed that there is also a unique constraint on the values. Then this method will |
|
| 57 | + * catch the exception and return 0. |
|
| 58 | + * |
|
| 59 | + * @param string $table The table name (will replace *PREFIX* with the actual prefix) |
|
| 60 | + * @param array $input data that should be inserted into the table (column name => value) |
|
| 61 | + * @param array|null $compare List of values that should be checked for "if not exists" |
|
| 62 | + * If this is null or an empty array, all keys of $input will be compared |
|
| 63 | + * Please note: text fields (clob) must not be used in the compare array |
|
| 64 | + * @return int number of inserted rows |
|
| 65 | + * @throws \Doctrine\DBAL\DBALException |
|
| 66 | + * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371 |
|
| 67 | + */ |
|
| 68 | + public function insertIfNotExist($table, $input, array $compare = null) { |
|
| 69 | + if (empty($compare)) { |
|
| 70 | + $compare = array_keys($input); |
|
| 71 | + } |
|
| 72 | + $fieldList = '`' . implode('`,`', array_keys($input)) . '`'; |
|
| 73 | + $query = "INSERT INTO `$table` ($fieldList) SELECT " |
|
| 74 | + . str_repeat('?,', count($input)-1).'? ' |
|
| 75 | + . " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE "; |
|
| 76 | 76 | |
| 77 | - $inserts = array_values($input); |
|
| 78 | - foreach($compare as $key) { |
|
| 79 | - $query .= '`' . $key . '`'; |
|
| 80 | - if (is_null($input[$key])) { |
|
| 81 | - $query .= ' IS NULL AND '; |
|
| 82 | - } else { |
|
| 83 | - $inserts[] = $input[$key]; |
|
| 84 | - $query .= ' = ? AND '; |
|
| 85 | - } |
|
| 86 | - } |
|
| 87 | - $query = substr($query, 0, -5); |
|
| 88 | - $query .= ')'; |
|
| 77 | + $inserts = array_values($input); |
|
| 78 | + foreach($compare as $key) { |
|
| 79 | + $query .= '`' . $key . '`'; |
|
| 80 | + if (is_null($input[$key])) { |
|
| 81 | + $query .= ' IS NULL AND '; |
|
| 82 | + } else { |
|
| 83 | + $inserts[] = $input[$key]; |
|
| 84 | + $query .= ' = ? AND '; |
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | + $query = substr($query, 0, -5); |
|
| 88 | + $query .= ')'; |
|
| 89 | 89 | |
| 90 | - try { |
|
| 91 | - return $this->conn->executeUpdate($query, $inserts); |
|
| 92 | - } catch (UniqueConstraintViolationException $e) { |
|
| 93 | - // if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it |
|
| 94 | - // it's fine to ignore this then |
|
| 95 | - // |
|
| 96 | - // more discussions about this can be found at https://github.com/nextcloud/server/pull/12315 |
|
| 97 | - return 0; |
|
| 98 | - } |
|
| 99 | - } |
|
| 90 | + try { |
|
| 91 | + return $this->conn->executeUpdate($query, $inserts); |
|
| 92 | + } catch (UniqueConstraintViolationException $e) { |
|
| 93 | + // if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it |
|
| 94 | + // it's fine to ignore this then |
|
| 95 | + // |
|
| 96 | + // more discussions about this can be found at https://github.com/nextcloud/server/pull/12315 |
|
| 97 | + return 0; |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | 100 | } |
@@ -25,22 +25,22 @@ |
||
| 25 | 25 | * @since 12.0.0 |
| 26 | 26 | */ |
| 27 | 27 | interface ISearchOrder { |
| 28 | - const DIRECTION_ASCENDING = 'asc'; |
|
| 29 | - const DIRECTION_DESCENDING = 'desc'; |
|
| 28 | + const DIRECTION_ASCENDING = 'asc'; |
|
| 29 | + const DIRECTION_DESCENDING = 'desc'; |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * The direction to sort in, either ISearchOrder::DIRECTION_ASCENDING or ISearchOrder::DIRECTION_DESCENDING |
|
| 33 | - * |
|
| 34 | - * @return string |
|
| 35 | - * @since 12.0.0 |
|
| 36 | - */ |
|
| 37 | - public function getDirection(); |
|
| 31 | + /** |
|
| 32 | + * The direction to sort in, either ISearchOrder::DIRECTION_ASCENDING or ISearchOrder::DIRECTION_DESCENDING |
|
| 33 | + * |
|
| 34 | + * @return string |
|
| 35 | + * @since 12.0.0 |
|
| 36 | + */ |
|
| 37 | + public function getDirection(); |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * The field to sort on |
|
| 41 | - * |
|
| 42 | - * @return string |
|
| 43 | - * @since 12.0.0 |
|
| 44 | - */ |
|
| 45 | - public function getField(); |
|
| 39 | + /** |
|
| 40 | + * The field to sort on |
|
| 41 | + * |
|
| 42 | + * @return string |
|
| 43 | + * @since 12.0.0 |
|
| 44 | + */ |
|
| 45 | + public function getField(); |
|
| 46 | 46 | } |
@@ -25,36 +25,36 @@ |
||
| 25 | 25 | * @since 12.0.0 |
| 26 | 26 | */ |
| 27 | 27 | interface ISearchComparison extends ISearchOperator { |
| 28 | - const COMPARE_EQUAL = 'eq'; |
|
| 29 | - const COMPARE_GREATER_THAN = 'gt'; |
|
| 30 | - const COMPARE_GREATER_THAN_EQUAL = 'gte'; |
|
| 31 | - const COMPARE_LESS_THAN = 'lt'; |
|
| 32 | - const COMPARE_LESS_THAN_EQUAL = 'lte'; |
|
| 33 | - const COMPARE_LIKE = 'like'; |
|
| 28 | + const COMPARE_EQUAL = 'eq'; |
|
| 29 | + const COMPARE_GREATER_THAN = 'gt'; |
|
| 30 | + const COMPARE_GREATER_THAN_EQUAL = 'gte'; |
|
| 31 | + const COMPARE_LESS_THAN = 'lt'; |
|
| 32 | + const COMPARE_LESS_THAN_EQUAL = 'lte'; |
|
| 33 | + const COMPARE_LIKE = 'like'; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Get the type of comparison, one of the ISearchComparison::COMPARE_* constants |
|
| 37 | - * |
|
| 38 | - * @return string |
|
| 39 | - * @since 12.0.0 |
|
| 40 | - */ |
|
| 41 | - public function getType(); |
|
| 35 | + /** |
|
| 36 | + * Get the type of comparison, one of the ISearchComparison::COMPARE_* constants |
|
| 37 | + * |
|
| 38 | + * @return string |
|
| 39 | + * @since 12.0.0 |
|
| 40 | + */ |
|
| 41 | + public function getType(); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Get the name of the field to compare with |
|
| 45 | - * |
|
| 46 | - * i.e. 'size', 'name' or 'mimetype' |
|
| 47 | - * |
|
| 48 | - * @return string |
|
| 49 | - * @since 12.0.0 |
|
| 50 | - */ |
|
| 51 | - public function getField(); |
|
| 43 | + /** |
|
| 44 | + * Get the name of the field to compare with |
|
| 45 | + * |
|
| 46 | + * i.e. 'size', 'name' or 'mimetype' |
|
| 47 | + * |
|
| 48 | + * @return string |
|
| 49 | + * @since 12.0.0 |
|
| 50 | + */ |
|
| 51 | + public function getField(); |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * Get the value to compare the field with |
|
| 55 | - * |
|
| 56 | - * @return string|integer|\DateTime |
|
| 57 | - * @since 12.0.0 |
|
| 58 | - */ |
|
| 59 | - public function getValue(); |
|
| 53 | + /** |
|
| 54 | + * Get the value to compare the field with |
|
| 55 | + * |
|
| 56 | + * @return string|integer|\DateTime |
|
| 57 | + * @since 12.0.0 |
|
| 58 | + */ |
|
| 59 | + public function getValue(); |
|
| 60 | 60 | } |