nextcloud / server

apps/dav/lib/Migration/Version1004Date20170919104507.php

Indentation +25 added lines, -25 removed lines

@@ -29,30 +29,30 @@
 
 class Version1004Date20170919104507 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('addressbooks');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('calendarobjects');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('calendarchanges');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('addressbooks');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('calendarobjects');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('calendarchanges');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        return $schema;
+    }
 
 }

apps/dav/lib/Migration/Version1004Date20170825134824.php

Indentation +439 added lines, -439 removed lines

@@ -28,454 +28,454 @@
 use OCP\Migration\IOutput;
 
 class Version1004Date20170825134824 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('addressbooks')) {
-			$table = $schema->createTable('addressbooks');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('description', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'uri'], 'addressbook_index');
-		}
+        if (!$schema->hasTable('addressbooks')) {
+            $table = $schema->createTable('addressbooks');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('description', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'uri'], 'addressbook_index');
+        }
 
-		if (!$schema->hasTable('cards')) {
-			$table = $schema->createTable('cards');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('addressbookid', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('carddata', 'blob', [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('lastmodified', 'bigint', [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-		}
+        if (!$schema->hasTable('cards')) {
+            $table = $schema->createTable('cards');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('addressbookid', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('carddata', 'blob', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('lastmodified', 'bigint', [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+        }
 
-		if (!$schema->hasTable('addressbookchanges')) {
-			$table = $schema->createTable('addressbookchanges');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('addressbookid', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('operation', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['addressbookid', 'synctoken'], 'addressbookid_synctoken');
-		}
+        if (!$schema->hasTable('addressbookchanges')) {
+            $table = $schema->createTable('addressbookchanges');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('addressbookid', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('operation', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['addressbookid', 'synctoken'], 'addressbookid_synctoken');
+        }
 
-		if (!$schema->hasTable('calendarobjects')) {
-			$table = $schema->createTable('calendarobjects');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendardata', 'blob', [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('calendarid', 'integer', [
-				'notnull' => true,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastmodified', 'integer', [
-				'notnull' => false,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('componenttype', 'string', [
-				'notnull' => false,
-				'length' => 8,
-			]);
-			$table->addColumn('firstoccurence', 'bigint', [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastoccurence', 'bigint', [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('classification', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['calendarid', 'uri'], 'calobjects_index');
-		}
+        if (!$schema->hasTable('calendarobjects')) {
+            $table = $schema->createTable('calendarobjects');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendardata', 'blob', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('calendarid', 'integer', [
+                'notnull' => true,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastmodified', 'integer', [
+                'notnull' => false,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('componenttype', 'string', [
+                'notnull' => false,
+                'length' => 8,
+            ]);
+            $table->addColumn('firstoccurence', 'bigint', [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastoccurence', 'bigint', [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('classification', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['calendarid', 'uri'], 'calobjects_index');
+        }
 
-		if (!$schema->hasTable('calendars')) {
-			$table = $schema->createTable('calendars');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'unsigned' => true,
-			]);
-			$table->addColumn('description', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('calendarorder', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarcolor', 'string', [
-				'notnull' => false,
-			]);
-			$table->addColumn('timezone', 'text', [
-				'notnull' => false,
-			]);
-			$table->addColumn('components', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('transparent', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'uri'], 'calendars_index');
-		}
+        if (!$schema->hasTable('calendars')) {
+            $table = $schema->createTable('calendars');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('description', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('calendarorder', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarcolor', 'string', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('timezone', 'text', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('components', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('transparent', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'uri'], 'calendars_index');
+        }
 
-		if (!$schema->hasTable('calendarchanges')) {
-			$table = $schema->createTable('calendarchanges');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarid', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('operation', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['calendarid', 'synctoken'], 'calendarid_synctoken');
-		}
+        if (!$schema->hasTable('calendarchanges')) {
+            $table = $schema->createTable('calendarchanges');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarid', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('operation', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['calendarid', 'synctoken'], 'calendarid_synctoken');
+        }
 
-		if (!$schema->hasTable('calendarsubscriptions')) {
-			$table = $schema->createTable('calendarsubscriptions');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('source', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 100,
-			]);
-			$table->addColumn('refreshrate', 'string', [
-				'notnull' => false,
-				'length' => 10,
-			]);
-			$table->addColumn('calendarorder', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarcolor', 'string', [
-				'notnull' => false,
-			]);
-			$table->addColumn('striptodos', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('stripalarms', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('stripattachments', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('lastmodified', 'integer', [
-				'notnull' => false,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'uri'], 'calsub_index');
-		}
+        if (!$schema->hasTable('calendarsubscriptions')) {
+            $table = $schema->createTable('calendarsubscriptions');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('source', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 100,
+            ]);
+            $table->addColumn('refreshrate', 'string', [
+                'notnull' => false,
+                'length' => 10,
+            ]);
+            $table->addColumn('calendarorder', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarcolor', 'string', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('striptodos', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('stripalarms', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('stripattachments', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('lastmodified', 'integer', [
+                'notnull' => false,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'uri'], 'calsub_index');
+        }
 
-		if (!$schema->hasTable('schedulingobjects')) {
-			$table = $schema->createTable('schedulingobjects');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('calendardata', 'blob', [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('lastmodified', 'integer', [
-				'notnull' => false,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-		}
+        if (!$schema->hasTable('schedulingobjects')) {
+            $table = $schema->createTable('schedulingobjects');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('calendardata', 'blob', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('lastmodified', 'integer', [
+                'notnull' => false,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+        }
 
-		if (!$schema->hasTable('cards_properties')) {
-			$table = $schema->createTable('cards_properties');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('addressbookid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-			]);
-			$table->addColumn('cardid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('value', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('preferred', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['cardid'], 'card_contactid_index');
-			$table->addIndex(['name'], 'card_name_index');
-			$table->addIndex(['value'], 'card_value_index');
-		}
+        if (!$schema->hasTable('cards_properties')) {
+            $table = $schema->createTable('cards_properties');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('addressbookid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+            ]);
+            $table->addColumn('cardid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('value', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('preferred', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['cardid'], 'card_contactid_index');
+            $table->addIndex(['name'], 'card_name_index');
+            $table->addIndex(['value'], 'card_value_index');
+        }
 
-		if (!$schema->hasTable('calendarobjects_props')) {
-			$table = $schema->createTable('calendarobjects_props');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-			]);
-			$table->addColumn('objectid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('parameter', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('value', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['objectid'], 'calendarobject_index');
-			$table->addIndex(['name'], 'calendarobject_name_index');
-			$table->addIndex(['value'], 'calendarobject_value_index');
-		}
+        if (!$schema->hasTable('calendarobjects_props')) {
+            $table = $schema->createTable('calendarobjects_props');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+            ]);
+            $table->addColumn('objectid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('parameter', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('value', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['objectid'], 'calendarobject_index');
+            $table->addIndex(['name'], 'calendarobject_name_index');
+            $table->addIndex(['value'], 'calendarobject_value_index');
+        }
 
-		if (!$schema->hasTable('dav_shares')) {
-			$table = $schema->createTable('dav_shares');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('type', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('access', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('resourceid', 'integer', [
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('publicuri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'resourceid', 'type', 'publicuri'], 'dav_shares_index');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('dav_shares')) {
+            $table = $schema->createTable('dav_shares');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('type', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('access', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('resourceid', 'integer', [
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('publicuri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'resourceid', 'type', 'publicuri'], 'dav_shares_index');
+        }
+        return $schema;
+    }
 }

lib/private/DB/SchemaWrapper.php

Indentation +103 added lines, -103 removed lines

@@ -30,107 +30,107 @@
 
 class SchemaWrapper implements ISchemaWrapper {
 
-	/** @var IDBConnection|Connection */
-	protected $connection;
-
-	/** @var Schema */
-	protected $schema;
-
-	/** @var array */
-	protected $tablesToDelete = [];
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		$this->schema = $this->connection->createSchema();
-	}
-
-	public function getWrappedSchema() {
-		return $this->schema;
-	}
-
-	public function performDropTableCalls() {
-		foreach ($this->tablesToDelete as $tableName => $true) {
-			$this->connection->dropTable($tableName);
-			unset($this->tablesToDelete[$tableName]);
-		}
-	}
-
-	/**
-	 * Gets all table names
-	 *
-	 * @return array
-	 */
-	public function getTableNamesWithoutPrefix() {
-		$tableNames = $this->schema->getTableNames();
-		return array_map(function($tableName) {
-			if (strpos($tableName, $this->connection->getPrefix()) === 0) {
-				return substr($tableName, strlen($this->connection->getPrefix()));
-			}
-
-			return $tableName;
-		}, $tableNames);
-	}
-
-	// Overwritten methods
-
-	/**
-	 * @return array
-	 */
-	public function getTableNames() {
-		return $this->schema->getTableNames();
-	}
-
-	/**
-	 * @param string $tableName
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Does this schema have a table with the given name?
-	 *
-	 * @param string $tableName
-	 *
-	 * @return boolean
-	 */
-	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Creates a new table.
-	 *
-	 * @param string $tableName
-	 * @return \Doctrine\DBAL\Schema\Table
-	 */
-	public function createTable($tableName) {
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Drops a table from the schema.
-	 *
-	 * @param string $tableName
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	public function dropTable($tableName) {
-		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Gets all tables of this schema.
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table[]
-	 */
-	public function getTables() {
-		return $this->schema->getTables();
-	}
+    /** @var IDBConnection|Connection */
+    protected $connection;
+
+    /** @var Schema */
+    protected $schema;
+
+    /** @var array */
+    protected $tablesToDelete = [];
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        $this->schema = $this->connection->createSchema();
+    }
+
+    public function getWrappedSchema() {
+        return $this->schema;
+    }
+
+    public function performDropTableCalls() {
+        foreach ($this->tablesToDelete as $tableName => $true) {
+            $this->connection->dropTable($tableName);
+            unset($this->tablesToDelete[$tableName]);
+        }
+    }
+
+    /**
+     * Gets all table names
+     *
+     * @return array
+     */
+    public function getTableNamesWithoutPrefix() {
+        $tableNames = $this->schema->getTableNames();
+        return array_map(function($tableName) {
+            if (strpos($tableName, $this->connection->getPrefix()) === 0) {
+                return substr($tableName, strlen($this->connection->getPrefix()));
+            }
+
+            return $tableName;
+        }, $tableNames);
+    }
+
+    // Overwritten methods
+
+    /**
+     * @return array
+     */
+    public function getTableNames() {
+        return $this->schema->getTableNames();
+    }
+
+    /**
+     * @param string $tableName
+     *
+     * @return \Doctrine\DBAL\Schema\Table
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function getTable($tableName) {
+        return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Does this schema have a table with the given name?
+     *
+     * @param string $tableName
+     *
+     * @return boolean
+     */
+    public function hasTable($tableName) {
+        return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Creates a new table.
+     *
+     * @param string $tableName
+     * @return \Doctrine\DBAL\Schema\Table
+     */
+    public function createTable($tableName) {
+        return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Drops a table from the schema.
+     *
+     * @param string $tableName
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    public function dropTable($tableName) {
+        $this->tablesToDelete[$tableName] = true;
+        return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Gets all tables of this schema.
+     *
+     * @return \Doctrine\DBAL\Schema\Table[]
+     */
+    public function getTables() {
+        return $this->schema->getTables();
+    }
 }

lib/private/DB/MigrationService.php

Indentation +410 added lines, -410 removed lines

@@ -37,414 +37,414 @@
 
 class MigrationService {
 
-	/** @var boolean */
-	private $migrationTableCreated;
-	/** @var array */
-	private $migrations;
-	/** @var IOutput */
-	private $output;
-	/** @var Connection */
-	private $connection;
-	/** @var string */
-	private $appName;
-
-	/**
-	 * MigrationService constructor.
-	 *
-	 * @param $appName
-	 * @param IDBConnection $connection
-	 * @param AppLocator $appLocator
-	 * @param IOutput|null $output
-	 * @throws \Exception
-	 */
-	public function __construct($appName, IDBConnection $connection, IOutput $output = null, AppLocator $appLocator = null) {
-		$this->appName = $appName;
-		$this->connection = $connection;
-		$this->output = $output;
-		if (null === $this->output) {
-			$this->output = new SimpleOutput(\OC::$server->getLogger(), $appName);
-		}
-
-		if ($appName === 'core') {
-			$this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
-			$this->migrationsNamespace = 'OC\\Core\\Migrations';
-		} else {
-			if (null === $appLocator) {
-				$appLocator = new AppLocator();
-			}
-			$appPath = $appLocator->getAppPath($appName);
-			$namespace = App::buildAppNamespace($appName);
-			$this->migrationsPath = "$appPath/lib/Migration";
-			$this->migrationsNamespace = $namespace . '\\Migration';
-		}
-	}
-
-	/**
-	 * Returns the name of the app for which this migration is executed
-	 *
-	 * @return string
-	 */
-	public function getApp() {
-		return $this->appName;
-	}
-
-	/**
-	 * @return bool
-	 * @codeCoverageIgnore - this will implicitly tested on installation
-	 */
-	private function createMigrationTable() {
-		if ($this->migrationTableCreated) {
-			return false;
-		}
-
-		$schema = new SchemaWrapper($this->connection);
-
-		/**
-		 * We drop the table when it has different columns or the definition does not
-		 * match. E.g. ownCloud uses a length of 177 for app and 14 for version.
-		 */
-		try {
-			$table = $schema->getTable('migrations');
-			$columns = $table->getColumns();
-
-			if (count($columns) === 2) {
-				try {
-					$column = $table->getColumn('app');
-					$schemaMismatch = $column->getLength() !== 255;
-
-					if (!$schemaMismatch) {
-						$column = $table->getColumn('version');
-						$schemaMismatch = $column->getLength() !== 255;
-					}
-				} catch (SchemaException $e) {
-					// One of the columns is missing
-					$schemaMismatch = true;
-				}
-
-				if (!$schemaMismatch) {
-					// Table exists and schema matches: return back!
-					$this->migrationTableCreated = true;
-					return false;
-				}
-			}
-
-			// Drop the table, when it didn't match our expectations.
-			$this->connection->dropTable($this->connection->getPrefix() . 'migrations');
-		} catch (SchemaException $e) {
-			// Table not found, no need to panic, we will create it.
-		}
-
-		$tableName = $this->connection->getPrefix() . 'migrations';
-		$tableName = $this->connection->getDatabasePlatform()->quoteIdentifier($tableName);
-
-		$columns = [
-			'app' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('app'), Type::getType('string'), ['length' => 255]),
-			'version' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('version'), Type::getType('string'), ['length' => 255]),
-		];
-		$table = new Table($tableName, $columns);
-		$table->setPrimaryKey([
-			$this->connection->getDatabasePlatform()->quoteIdentifier('app'),
-			$this->connection->getDatabasePlatform()->quoteIdentifier('version')]);
-		$this->connection->getSchemaManager()->createTable($table);
-
-		$this->migrationTableCreated = true;
-
-		return true;
-	}
-
-	/**
-	 * Returns all versions which have already been applied
-	 *
-	 * @return string[]
-	 * @codeCoverageIgnore - no need to test this
-	 */
-	public function getMigratedVersions() {
-		$this->createMigrationTable();
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('version')
-			->from('migrations')
-			->where($qb->expr()->eq('app', $qb->createNamedParameter($this->getApp())))
-			->orderBy('version');
-
-		$result = $qb->execute();
-		$rows = $result->fetchAll(\PDO::FETCH_COLUMN);
-		$result->closeCursor();
-
-		return $rows;
-	}
-
-	/**
-	 * Returns all versions which are available in the migration folder
-	 *
-	 * @return array
-	 */
-	public function getAvailableVersions() {
-		$this->ensureMigrationsAreLoaded();
-		return array_map('strval', array_keys($this->migrations));
-	}
-
-	protected function findMigrations() {
-		$directory = realpath($this->migrationsPath);
-		if ($directory === false || !file_exists($directory) || !is_dir($directory)) {
-			return [];
-		}
-
-		$iterator = new \RegexIterator(
-			new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS),
-				\RecursiveIteratorIterator::LEAVES_ONLY
-			),
-			'#^.+\\/Version[^\\/]{1,255}\\.php$#i',
-			\RegexIterator::GET_MATCH);
-
-		$files = array_keys(iterator_to_array($iterator));
-		uasort($files, function ($a, $b) {
-			preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA);
-			preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB);
-			if (!empty($matchA) && !empty($matchB)) {
-				if ($matchA[1] !== $matchB[1]) {
-					return ($matchA[1] < $matchB[1]) ? -1 : 1;
-				}
-				return ($matchA[2] < $matchB[2]) ? -1 : 1;
-			}
-			return (basename($a) < basename($b)) ? -1 : 1;
-		});
-
-		$migrations = [];
-
-		foreach ($files as $file) {
-			$className = basename($file, '.php');
-			$version = (string) substr($className, 7);
-			if ($version === '0') {
-				throw new \InvalidArgumentException(
-					"Cannot load a migrations with the name '$version' because it is a reserved number"
-				);
-			}
-			$migrations[$version] = sprintf('%s\\%s', $this->migrationsNamespace, $className);
-		}
-
-		return $migrations;
-	}
-
-	/**
-	 * @param string $to
-	 * @return string[]
-	 */
-	private function getMigrationsToExecute($to) {
-		$knownMigrations = $this->getMigratedVersions();
-		$availableMigrations = $this->getAvailableVersions();
-
-		$toBeExecuted = [];
-		foreach ($availableMigrations as $v) {
-			if ($to !== 'latest' && $v > $to) {
-				continue;
-			}
-			if ($this->shallBeExecuted($v, $knownMigrations)) {
-				$toBeExecuted[] = $v;
-			}
-		}
-
-		return $toBeExecuted;
-	}
-
-	/**
-	 * @param string $m
-	 * @param string[] $knownMigrations
-	 * @return bool
-	 */
-	private function shallBeExecuted($m, $knownMigrations) {
-		if (in_array($m, $knownMigrations)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $version
-	 */
-	private function markAsExecuted($version) {
-		$this->connection->insertIfNotExist('*PREFIX*migrations', [
-			'app' => $this->appName,
-			'version' => $version
-		]);
-	}
-
-	/**
-	 * Returns the name of the table which holds the already applied versions
-	 *
-	 * @return string
-	 */
-	public function getMigrationsTableName() {
-		return $this->connection->getPrefix() . 'migrations';
-	}
-
-	/**
-	 * Returns the namespace of the version classes
-	 *
-	 * @return string
-	 */
-	public function getMigrationsNamespace() {
-		return $this->migrationsNamespace;
-	}
-
-	/**
-	 * Returns the directory which holds the versions
-	 *
-	 * @return string
-	 */
-	public function getMigrationsDirectory() {
-		return $this->migrationsPath;
-	}
-
-	/**
-	 * Return the explicit version for the aliases; current, next, prev, latest
-	 *
-	 * @param string $alias
-	 * @return mixed|null|string
-	 */
-	public function getMigration($alias) {
-		switch($alias) {
-			case 'current':
-				return $this->getCurrentVersion();
-			case 'next':
-				return $this->getRelativeVersion($this->getCurrentVersion(), 1);
-			case 'prev':
-				return $this->getRelativeVersion($this->getCurrentVersion(), -1);
-			case 'latest':
-				$this->ensureMigrationsAreLoaded();
-
-				$migrations = $this->getAvailableVersions();
-				return @end($migrations);
-		}
-		return '0';
-	}
-
-	/**
-	 * @param string $version
-	 * @param int $delta
-	 * @return null|string
-	 */
-	private function getRelativeVersion($version, $delta) {
-		$this->ensureMigrationsAreLoaded();
-
-		$versions = $this->getAvailableVersions();
-		array_unshift($versions, 0);
-		$offset = array_search($version, $versions, true);
-		if ($offset === false || !isset($versions[$offset + $delta])) {
-			// Unknown version or delta out of bounds.
-			return null;
-		}
-
-		return (string) $versions[$offset + $delta];
-	}
-
-	/**
-	 * @return string
-	 */
-	private function getCurrentVersion() {
-		$m = $this->getMigratedVersions();
-		if (count($m) === 0) {
-			return '0';
-		}
-		$migrations = array_values($m);
-		return @end($migrations);
-	}
-
-	/**
-	 * @param string $version
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 */
-	private function getClass($version) {
-		$this->ensureMigrationsAreLoaded();
-
-		if (isset($this->migrations[$version])) {
-			return $this->migrations[$version];
-		}
-
-		throw new \InvalidArgumentException("Version $version is unknown.");
-	}
-
-	/**
-	 * Allows to set an IOutput implementation which is used for logging progress and messages
-	 *
-	 * @param IOutput $output
-	 */
-	public function setOutput(IOutput $output) {
-		$this->output = $output;
-	}
-
-	/**
-	 * Applies all not yet applied versions up to $to
-	 *
-	 * @param string $to
-	 * @throws \InvalidArgumentException
-	 */
-	public function migrate($to = 'latest') {
-		// read known migrations
-		$toBeExecuted = $this->getMigrationsToExecute($to);
-		foreach ($toBeExecuted as $version) {
-			$this->executeStep($version);
-		}
-	}
-
-	/**
-	 * @param string $version
-	 * @return mixed
-	 * @throws \InvalidArgumentException
-	 */
-	protected function createInstance($version) {
-		$class = $this->getClass($version);
-		try {
-			$s = \OC::$server->query($class);
-		} catch (QueryException $e) {
-			if (class_exists($class)) {
-				$s = new $class();
-			} else {
-				throw new \InvalidArgumentException("Migration step '$class' is unknown");
-			}
-		}
-
-		return $s;
-	}
-
-	/**
-	 * Executes one explicit version
-	 *
-	 * @param string $version
-	 * @throws \InvalidArgumentException
-	 */
-	public function executeStep($version) {
-		$instance = $this->createInstance($version);
-		if (!$instance instanceof IMigrationStep) {
-			throw new \InvalidArgumentException('Not a valid migration');
-		}
-
-		$instance->preSchemaChange($this->output, function() {
-			return new SchemaWrapper($this->connection);
-		}, ['tablePrefix' => $this->connection->getPrefix()]);
-
-		$toSchema = $instance->changeSchema($this->output, function() {
-			return new SchemaWrapper($this->connection);
-		}, ['tablePrefix' => $this->connection->getPrefix()]);
-
-		if ($toSchema instanceof SchemaWrapper) {
-			$this->connection->migrateToSchema($toSchema->getWrappedSchema());
-			$toSchema->performDropTableCalls();
-		}
-
-		$instance->postSchemaChange($this->output, function() {
-			return new SchemaWrapper($this->connection);
-		}, ['tablePrefix' => $this->connection->getPrefix()]);
-
-		$this->markAsExecuted($version);
-	}
-
-	private function ensureMigrationsAreLoaded() {
-		if (empty($this->migrations)) {
-			$this->migrations = $this->findMigrations();
-		}
-	}
+    /** @var boolean */
+    private $migrationTableCreated;
+    /** @var array */
+    private $migrations;
+    /** @var IOutput */
+    private $output;
+    /** @var Connection */
+    private $connection;
+    /** @var string */
+    private $appName;
+
+    /**
+     * MigrationService constructor.
+     *
+     * @param $appName
+     * @param IDBConnection $connection
+     * @param AppLocator $appLocator
+     * @param IOutput|null $output
+     * @throws \Exception
+     */
+    public function __construct($appName, IDBConnection $connection, IOutput $output = null, AppLocator $appLocator = null) {
+        $this->appName = $appName;
+        $this->connection = $connection;
+        $this->output = $output;
+        if (null === $this->output) {
+            $this->output = new SimpleOutput(\OC::$server->getLogger(), $appName);
+        }
+
+        if ($appName === 'core') {
+            $this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
+            $this->migrationsNamespace = 'OC\\Core\\Migrations';
+        } else {
+            if (null === $appLocator) {
+                $appLocator = new AppLocator();
+            }
+            $appPath = $appLocator->getAppPath($appName);
+            $namespace = App::buildAppNamespace($appName);
+            $this->migrationsPath = "$appPath/lib/Migration";
+            $this->migrationsNamespace = $namespace . '\\Migration';
+        }
+    }
+
+    /**
+     * Returns the name of the app for which this migration is executed
+     *
+     * @return string
+     */
+    public function getApp() {
+        return $this->appName;
+    }
+
+    /**
+     * @return bool
+     * @codeCoverageIgnore - this will implicitly tested on installation
+     */
+    private function createMigrationTable() {
+        if ($this->migrationTableCreated) {
+            return false;
+        }
+
+        $schema = new SchemaWrapper($this->connection);
+
+        /**
+         * We drop the table when it has different columns or the definition does not
+         * match. E.g. ownCloud uses a length of 177 for app and 14 for version.
+         */
+        try {
+            $table = $schema->getTable('migrations');
+            $columns = $table->getColumns();
+
+            if (count($columns) === 2) {
+                try {
+                    $column = $table->getColumn('app');
+                    $schemaMismatch = $column->getLength() !== 255;
+
+                    if (!$schemaMismatch) {
+                        $column = $table->getColumn('version');
+                        $schemaMismatch = $column->getLength() !== 255;
+                    }
+                } catch (SchemaException $e) {
+                    // One of the columns is missing
+                    $schemaMismatch = true;
+                }
+
+                if (!$schemaMismatch) {
+                    // Table exists and schema matches: return back!
+                    $this->migrationTableCreated = true;
+                    return false;
+                }
+            }
+
+            // Drop the table, when it didn't match our expectations.
+            $this->connection->dropTable($this->connection->getPrefix() . 'migrations');
+        } catch (SchemaException $e) {
+            // Table not found, no need to panic, we will create it.
+        }
+
+        $tableName = $this->connection->getPrefix() . 'migrations';
+        $tableName = $this->connection->getDatabasePlatform()->quoteIdentifier($tableName);
+
+        $columns = [
+            'app' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('app'), Type::getType('string'), ['length' => 255]),
+            'version' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('version'), Type::getType('string'), ['length' => 255]),
+        ];
+        $table = new Table($tableName, $columns);
+        $table->setPrimaryKey([
+            $this->connection->getDatabasePlatform()->quoteIdentifier('app'),
+            $this->connection->getDatabasePlatform()->quoteIdentifier('version')]);
+        $this->connection->getSchemaManager()->createTable($table);
+
+        $this->migrationTableCreated = true;
+
+        return true;
+    }
+
+    /**
+     * Returns all versions which have already been applied
+     *
+     * @return string[]
+     * @codeCoverageIgnore - no need to test this
+     */
+    public function getMigratedVersions() {
+        $this->createMigrationTable();
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('version')
+            ->from('migrations')
+            ->where($qb->expr()->eq('app', $qb->createNamedParameter($this->getApp())))
+            ->orderBy('version');
+
+        $result = $qb->execute();
+        $rows = $result->fetchAll(\PDO::FETCH_COLUMN);
+        $result->closeCursor();
+
+        return $rows;
+    }
+
+    /**
+     * Returns all versions which are available in the migration folder
+     *
+     * @return array
+     */
+    public function getAvailableVersions() {
+        $this->ensureMigrationsAreLoaded();
+        return array_map('strval', array_keys($this->migrations));
+    }
+
+    protected function findMigrations() {
+        $directory = realpath($this->migrationsPath);
+        if ($directory === false || !file_exists($directory) || !is_dir($directory)) {
+            return [];
+        }
+
+        $iterator = new \RegexIterator(
+            new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS),
+                \RecursiveIteratorIterator::LEAVES_ONLY
+            ),
+            '#^.+\\/Version[^\\/]{1,255}\\.php$#i',
+            \RegexIterator::GET_MATCH);
+
+        $files = array_keys(iterator_to_array($iterator));
+        uasort($files, function ($a, $b) {
+            preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA);
+            preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB);
+            if (!empty($matchA) && !empty($matchB)) {
+                if ($matchA[1] !== $matchB[1]) {
+                    return ($matchA[1] < $matchB[1]) ? -1 : 1;
+                }
+                return ($matchA[2] < $matchB[2]) ? -1 : 1;
+            }
+            return (basename($a) < basename($b)) ? -1 : 1;
+        });
+
+        $migrations = [];
+
+        foreach ($files as $file) {
+            $className = basename($file, '.php');
+            $version = (string) substr($className, 7);
+            if ($version === '0') {
+                throw new \InvalidArgumentException(
+                    "Cannot load a migrations with the name '$version' because it is a reserved number"
+                );
+            }
+            $migrations[$version] = sprintf('%s\\%s', $this->migrationsNamespace, $className);
+        }
+
+        return $migrations;
+    }
+
+    /**
+     * @param string $to
+     * @return string[]
+     */
+    private function getMigrationsToExecute($to) {
+        $knownMigrations = $this->getMigratedVersions();
+        $availableMigrations = $this->getAvailableVersions();
+
+        $toBeExecuted = [];
+        foreach ($availableMigrations as $v) {
+            if ($to !== 'latest' && $v > $to) {
+                continue;
+            }
+            if ($this->shallBeExecuted($v, $knownMigrations)) {
+                $toBeExecuted[] = $v;
+            }
+        }
+
+        return $toBeExecuted;
+    }
+
+    /**
+     * @param string $m
+     * @param string[] $knownMigrations
+     * @return bool
+     */
+    private function shallBeExecuted($m, $knownMigrations) {
+        if (in_array($m, $knownMigrations)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $version
+     */
+    private function markAsExecuted($version) {
+        $this->connection->insertIfNotExist('*PREFIX*migrations', [
+            'app' => $this->appName,
+            'version' => $version
+        ]);
+    }
+
+    /**
+     * Returns the name of the table which holds the already applied versions
+     *
+     * @return string
+     */
+    public function getMigrationsTableName() {
+        return $this->connection->getPrefix() . 'migrations';
+    }
+
+    /**
+     * Returns the namespace of the version classes
+     *
+     * @return string
+     */
+    public function getMigrationsNamespace() {
+        return $this->migrationsNamespace;
+    }
+
+    /**
+     * Returns the directory which holds the versions
+     *
+     * @return string
+     */
+    public function getMigrationsDirectory() {
+        return $this->migrationsPath;
+    }
+
+    /**
+     * Return the explicit version for the aliases; current, next, prev, latest
+     *
+     * @param string $alias
+     * @return mixed|null|string
+     */
+    public function getMigration($alias) {
+        switch($alias) {
+            case 'current':
+                return $this->getCurrentVersion();
+            case 'next':
+                return $this->getRelativeVersion($this->getCurrentVersion(), 1);
+            case 'prev':
+                return $this->getRelativeVersion($this->getCurrentVersion(), -1);
+            case 'latest':
+                $this->ensureMigrationsAreLoaded();
+
+                $migrations = $this->getAvailableVersions();
+                return @end($migrations);
+        }
+        return '0';
+    }
+
+    /**
+     * @param string $version
+     * @param int $delta
+     * @return null|string
+     */
+    private function getRelativeVersion($version, $delta) {
+        $this->ensureMigrationsAreLoaded();
+
+        $versions = $this->getAvailableVersions();
+        array_unshift($versions, 0);
+        $offset = array_search($version, $versions, true);
+        if ($offset === false || !isset($versions[$offset + $delta])) {
+            // Unknown version or delta out of bounds.
+            return null;
+        }
+
+        return (string) $versions[$offset + $delta];
+    }
+
+    /**
+     * @return string
+     */
+    private function getCurrentVersion() {
+        $m = $this->getMigratedVersions();
+        if (count($m) === 0) {
+            return '0';
+        }
+        $migrations = array_values($m);
+        return @end($migrations);
+    }
+
+    /**
+     * @param string $version
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    private function getClass($version) {
+        $this->ensureMigrationsAreLoaded();
+
+        if (isset($this->migrations[$version])) {
+            return $this->migrations[$version];
+        }
+
+        throw new \InvalidArgumentException("Version $version is unknown.");
+    }
+
+    /**
+     * Allows to set an IOutput implementation which is used for logging progress and messages
+     *
+     * @param IOutput $output
+     */
+    public function setOutput(IOutput $output) {
+        $this->output = $output;
+    }
+
+    /**
+     * Applies all not yet applied versions up to $to
+     *
+     * @param string $to
+     * @throws \InvalidArgumentException
+     */
+    public function migrate($to = 'latest') {
+        // read known migrations
+        $toBeExecuted = $this->getMigrationsToExecute($to);
+        foreach ($toBeExecuted as $version) {
+            $this->executeStep($version);
+        }
+    }
+
+    /**
+     * @param string $version
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    protected function createInstance($version) {
+        $class = $this->getClass($version);
+        try {
+            $s = \OC::$server->query($class);
+        } catch (QueryException $e) {
+            if (class_exists($class)) {
+                $s = new $class();
+            } else {
+                throw new \InvalidArgumentException("Migration step '$class' is unknown");
+            }
+        }
+
+        return $s;
+    }
+
+    /**
+     * Executes one explicit version
+     *
+     * @param string $version
+     * @throws \InvalidArgumentException
+     */
+    public function executeStep($version) {
+        $instance = $this->createInstance($version);
+        if (!$instance instanceof IMigrationStep) {
+            throw new \InvalidArgumentException('Not a valid migration');
+        }
+
+        $instance->preSchemaChange($this->output, function() {
+            return new SchemaWrapper($this->connection);
+        }, ['tablePrefix' => $this->connection->getPrefix()]);
+
+        $toSchema = $instance->changeSchema($this->output, function() {
+            return new SchemaWrapper($this->connection);
+        }, ['tablePrefix' => $this->connection->getPrefix()]);
+
+        if ($toSchema instanceof SchemaWrapper) {
+            $this->connection->migrateToSchema($toSchema->getWrappedSchema());
+            $toSchema->performDropTableCalls();
+        }
+
+        $instance->postSchemaChange($this->output, function() {
+            return new SchemaWrapper($this->connection);
+        }, ['tablePrefix' => $this->connection->getPrefix()]);
+
+        $this->markAsExecuted($version);
+    }
+
+    private function ensureMigrationsAreLoaded() {
+        if (empty($this->migrations)) {
+            $this->migrations = $this->findMigrations();
+        }
+    }
 }

lib/public/DB/ISchemaWrapper.php

Indentation +54 added lines, -54 removed lines

@@ -29,64 +29,64 @@
  */
 interface ISchemaWrapper {
 
-	/**
-	 * @param string $tableName
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 * @since 13.0.0
-	 */
-	public function getTable($tableName);
+    /**
+     * @param string $tableName
+     *
+     * @return \Doctrine\DBAL\Schema\Table
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     * @since 13.0.0
+     */
+    public function getTable($tableName);
 
-	/**
-	 * Does this schema have a table with the given name?
-	 *
-	 * @param string $tableName Prefix is automatically prepended
-	 *
-	 * @return boolean
-	 * @since 13.0.0
-	 */
-	public function hasTable($tableName);
+    /**
+     * Does this schema have a table with the given name?
+     *
+     * @param string $tableName Prefix is automatically prepended
+     *
+     * @return boolean
+     * @since 13.0.0
+     */
+    public function hasTable($tableName);
 
-	/**
-	 * Creates a new table.
-	 *
-	 * @param string $tableName Prefix is automatically prepended
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @since 13.0.0
-	 */
-	public function createTable($tableName);
+    /**
+     * Creates a new table.
+     *
+     * @param string $tableName Prefix is automatically prepended
+     * @return \Doctrine\DBAL\Schema\Table
+     * @since 13.0.0
+     */
+    public function createTable($tableName);
 
-	/**
-	 * Drops a table from the schema.
-	 *
-	 * @param string $tableName Prefix is automatically prepended
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 * @since 13.0.0
-	 */
-	public function dropTable($tableName);
+    /**
+     * Drops a table from the schema.
+     *
+     * @param string $tableName Prefix is automatically prepended
+     * @return \Doctrine\DBAL\Schema\Schema
+     * @since 13.0.0
+     */
+    public function dropTable($tableName);
 
-	/**
-	 * Gets all tables of this schema.
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table[]
-	 * @since 13.0.0
-	 */
-	public function getTables();
+    /**
+     * Gets all tables of this schema.
+     *
+     * @return \Doctrine\DBAL\Schema\Table[]
+     * @since 13.0.0
+     */
+    public function getTables();
 
-	/**
-	 * Gets all table names, prefixed with table prefix
-	 *
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function getTableNames();
+    /**
+     * Gets all table names, prefixed with table prefix
+     *
+     * @return array
+     * @since 13.0.0
+     */
+    public function getTableNames();
 	
-	/**
-	 * Gets all table names
-	 *
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function getTableNamesWithoutPrefix();
+    /**
+     * Gets all table names
+     *
+     * @return array
+     * @since 13.0.0
+     */
+    public function getTableNamesWithoutPrefix();
 }

lib/public/Migration/IMigrationStep.php

Indentation +22 added lines, -22 removed lines

@@ -30,28 +30,28 @@
  */
 interface IMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options);
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
 }

lib/public/Migration/BigIntMigration.php

Indentation +29 added lines, -29 removed lines

@@ -31,38 +31,38 @@
  */
 abstract class BigIntMigration extends SimpleMigrationStep {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	abstract protected function getColumnsByTable();
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    abstract protected function getColumnsByTable();
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$tables = $this->getColumnsByTable();
+        $tables = $this->getColumnsByTable();
 
-		foreach ($tables as $tableName => $columns) {
-			$table = $schema->getTable($tableName);
+        foreach ($tables as $tableName => $columns) {
+            $table = $schema->getTable($tableName);
 
-			foreach ($columns as $columnName) {
-				$column = $table->getColumn($columnName);
-				if ($column->getType()->getName() !== Type::BIGINT) {
-					$column->setType(Type::getType(Type::BIGINT));
-					$column->setOptions(['length' => 20]);
-				}
-			}
-		}
+            foreach ($columns as $columnName) {
+                $column = $table->getColumn($columnName);
+                if ($column->getType()->getName() !== Type::BIGINT) {
+                    $column->setType(Type::getType(Type::BIGINT));
+                    $column->setOptions(['length' => 20]);
+                }
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/public/Migration/SimpleMigrationStep.php

Indentation +26 added lines, -26 removed lines

@@ -30,32 +30,32 @@
  */
 abstract class SimpleMigrationStep implements IMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		return null;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        return null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }