66c66
< index d3fac6e..d4a8bd1 100644
---
> index d3fac6e..3ca9c0f 100644
69c69
< @@ -222,4 +222,13 @@ public function isEmpty() {
---
> @@ -222,4 +222,14 @@ public function isEmpty() {
81a82
> +
100c101
< index 39359c3..aada83c 100644
---
> index 39359c3..c21d38f 100644
103c104,112
< @@ -69,7 +69,13 @@ public function getMultiple(&$cids, $allow_invalid = FALSE) {
---
> @@ -9,6 +9,7 @@
>  
>  use Drupal\Core\Database\Connection;
>  use Drupal\Core\Database\Database;
> +use Drupal\Core\Database\SchemaObjectExistsException;
>  
>  /**
>   * Defines a default cache implementation.
> @@ -69,7 +70,13 @@ public function getMultiple(&$cids, $allow_invalid = FALSE) {
118c127
< @@ -134,6 +140,28 @@ protected function prepareItem($cache, $allow_invalid) {
---
> @@ -134,6 +141,28 @@ protected function prepareItem($cache, $allow_invalid) {
147c156
< @@ -163,9 +191,7 @@ public function set($cid, $data, $expire = CacheBackendInterface::CACHE_PERMANEN
---
> @@ -163,9 +192,7 @@ public function set($cid, $data, $expire = CacheBackendInterface::CACHE_PERMANEN
158c167
< @@ -188,11 +214,16 @@ public function deleteTags(array $tags) {
---
> @@ -188,11 +215,16 @@ public function deleteTags(array $tags) {
180c189
< @@ -200,7 +231,12 @@ public function deleteTags(array $tags) {
---
> @@ -200,7 +232,12 @@ public function deleteTags(array $tags) {
194c203
< @@ -214,28 +250,38 @@ public function invalidate($cid) {
---
> @@ -214,28 +251,38 @@ public function invalidate($cid) {
248c257
< @@ -243,19 +289,31 @@ public function invalidateTags(array $tags) {
---
> @@ -243,19 +290,31 @@ public function invalidateTags(array $tags) {
287c296
< @@ -329,9 +387,159 @@ public function isEmpty() {
---
> @@ -329,9 +388,159 @@ public function isEmpty() {
336c345
< +    catch (\Exception $e) {
---
> +    catch (SchemaObjectExistsException $e) {
515c524
< index 695fd89..eb1c82f 100644
---
> index c1a1378..64833a5 100644
518,521c527,533
< @@ -161,9 +161,6 @@ function field_schema() {
<        'deleted' => array('deleted'),
<      ),
<    );
---
> @@ -9,16 +9,6 @@
>  use Drupal\field\Plugin\Core\Entity\Field;
>  
>  /**
> - * Implements hook_schema().
> - */
> -function field_schema() {
525,527c537,543
<    return $schema;
<  }
<  
---
> -  return $schema;
> -}
> -
> -/**
>   * Creates a field by writing directly to the database.
>   *
>   * @ingroup update_api
529c545
< index 68127e2..35ff3e7 100644
---
> index 13aa535..67e05d0 100644