Move database files to the new lib directory and update code accordingly.

core/includes/Drupal/Database/Driver/mysql/Delete.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\mysql;
-
-use Drupal\Database\Query\Delete as QueryDelete;
-
-class Delete extends QueryDelete { }

core/includes/Drupal/Database/Driver/mysql/Merge.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\mysql;
-
-use Drupal\Database\Query\Merge as QueryMerge;
-
-class Merge extends QueryMerge { }

core/includes/Drupal/Database/Driver/mysql/Select.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\mysql;
-
-use Drupal\Database\Query\Select as QuerySelect;
-
-class Select extends QuerySelect { }

core/includes/Drupal/Database/Driver/mysql/Transaction.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\mysql;
-
-use Drupal\Database\Transaction as DatabaseTransaction;
-
-class Transaction extends DatabaseTransaction { }

core/includes/Drupal/Database/Driver/mysql/Update.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\mysql;
-
-use Drupal\Database\Query\Update as QueryUpdate;
-
-class Update extends QueryUpdate { }

core/includes/Drupal/Database/Driver/sqlite/Merge.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\sqlite;
-
-use Drupal\Database\Query\Merge as QueryMerge;
-
-class Merge extends QueryMerge { }

core/includes/Drupal/Database/Driver/sqlite/Transaction.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace Drupal\Database\Driver\sqlite;
-
-use Drupal\Database\Transaction as DatabaseTransaction;
-
-class Transaction extends DatabaseTransaction { }

core/includes/bootstrap.inc

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 use Symfony\Component\ClassLoader\UniversalClassLoader;
 use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 

core/includes/common.inc

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/includes/database/database.inc

@@ -1,7 +1,7 @@
 <?php
 
-use Drupal\Database\Database;
-use Drupal\Database\Query\Condition;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Condition;
 
 /**
  * @file

core/includes/install.core.inc

@@ -1,7 +1,7 @@
 <?php
 
-use Drupal\Database\Database;
-use Drupal\Database\Install\TaskException;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Install\TaskException;
 
 /**
  * @file
@@ -234,7 +234,23 @@ function install_begin_request(&$install_state) {
 
   // Ensure that the class loader is available so that we can leverage classes
   // as part of the install routine.
-  drupal_initialize_classloader();
+  $loader = drupal_classloader();
+
+  // Register explicit vendor namespaces.
+  $loader->registerNamespaces(array(
+    // All Symfony-borrowed code lives in /core/includes/Symfony.
+    'Symfony' => DRUPAL_ROOT . '/core/vendor',
+  ));
+  // Register the Drupal namespace for classes in core as a fallback.
+  // This allows to register additional namespaces within the Drupal namespace
+  // (e.g., for modules) and avoids an additional file_exists() on the Drupal
+  // core namespace, since the class loader can already determine the best
+  // namespace match based on a string comparison. It further allows modules to
+  // register/overload namespaces in Drupal core.
+  $loader->registerNamespaceFallbacks(array(
+    // All Drupal-namespaced code in core lives in /core/includes/Drupal.
+    'Drupal' => DRUPAL_ROOT . '/core/lib',
+  ));
 
   if (!$install_state['interactive']) {
     drupal_override_server_variables($install_state['server']);

core/includes/install.inc

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * Indicates that a module has not been installed yet.
@@ -256,7 +256,7 @@ function drupal_get_database_types() {
   // Because we have no registry yet, we need to also include the install.inc
   // file for the driver explicitly.
   require_once DRUPAL_ROOT . '/core/includes/database/database.inc';
-  foreach (file_scan_directory(DRUPAL_ROOT . '/core/includes/Drupal/Database/Driver', '/^[a-z]*$/i', array('recurse' => FALSE)) as $file) {
+  foreach (file_scan_directory(DRUPAL_ROOT . '/core/lib/Drupal/Core/Database/Driver', '/^[a-z]*$/i', array('recurse' => FALSE)) as $file) {
     if (file_exists($file->uri . '/Install/Tasks.php')) {
       $drivers[$file->filename] = $file->uri;
     }
@@ -1006,6 +1006,6 @@ function db_run_tasks($driver) {
 function db_installer_object($driver) {
   // We cannot use Database::getConnection->getDriverClass() here, because
   // the connection object is not yet functional.
-  $task_class = "Drupal\\Database\\Driver\\{$driver}\\Install\\Tasks";
+  $task_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\Install\\Tasks";
   return new $task_class();
 }

core/includes/pager.inc

@@ -1,8 +1,8 @@
 <?php
 
-use Drupal\Database\Connection;
-use Drupal\Database\Query\SelectExtender;
-use Drupal\Database\Query\SelectInterface;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Query\SelectExtender;
+use Drupal\Core\Database\Query\SelectInterface;
 
 /**
  * @file

core/includes/registry.inc

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/includes/tablesort.inc

@@ -1,8 +1,8 @@
 <?php
 
-use Drupal\Database\Connection;
-use Drupal\Database\Query\SelectExtender;
-use Drupal\Database\Query\SelectInterface;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Query\SelectExtender;
+use Drupal\Core\Database\Query\SelectInterface;
 
 /**
  * @file

core/lib/Drupal/Core/Database/Connection.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
-use Drupal\Database\DatabaseTransactionNoActiveException;
-use Drupal\Database\DatabaseTransactionOutOfOrderException;
+use Drupal\Core\Database\DatabaseTransactionNoActiveException;
+use Drupal\Core\Database\DatabaseTransactionOutOfOrderException;
 
 use PDO;
 use PDOException;
@@ -70,7 +70,7 @@ abstract class Connection extends PDO {
    *
    * @var string
    */
-  protected $statementClass = '\\Drupal\\Database\\StatementBase';
+  protected $statementClass = '\\Drupal\\Core\\Database\\StatementBase';
 
   /**
    * Whether this database connection supports transactions.
@@ -593,7 +593,7 @@ abstract class Connection extends PDO {
   public function getDriverClass($class) {
     if (empty($this->driverClasses[$class])) {
       $driver = $this->driver();
-      $driver_class = "Drupal\\Database\\Driver\\{$driver}\\{$class}";
+      $driver_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\{$class}";
       $this->driverClasses[$class] = class_exists($driver_class) ? $driver_class : $class;
     }
     return $this->driverClasses[$class];

core/lib/Drupal/Core/Database/ConnectionNotDefinedException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/Database.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Primary front-controller for the database system.
@@ -371,7 +371,7 @@ abstract class Database {
 
     // We cannot rely on the registry yet, because the registry requires an
     // open database connection.
-    $driver_class = "Drupal\\Database\\Driver\\{$driver}\\Connection";
+    $driver_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\Connection";
     $new_connection = new $driver_class(self::$databaseInfo[$key][$target]);
     $new_connection->setTarget($target);
     $new_connection->setKey($key);

core/lib/Drupal/Core/Database/Driver/mysql/Connection.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Database\Driver\mysql;
+namespace Drupal\Core\Database\Driver\mysql;
 
-use Drupal\Database\Database;
-use Drupal\Database\DatabaseTransactionCommitFailedException;
-use Drupal\Database\Connection as DatabaseConnection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseTransactionCommitFailedException;
+use Drupal\Core\Database\Connection as DatabaseConnection;
 
 use PDO;
 use PDOException;

core/lib/Drupal/Core/Database/Driver/mysql/Delete.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\mysql;
+
+use Drupal\Core\Database\Query\Delete as QueryDelete;
+
+class Delete extends QueryDelete { }

core/lib/Drupal/Core/Database/Driver/mysql/Insert.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\mysql;
+namespace Drupal\Core\Database\Driver\mysql;
 
-use Drupal\Database\Query\Insert as QueryInsert;
+use Drupal\Core\Database\Query\Insert as QueryInsert;
 
 class Insert extends QueryInsert {
 

core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\mysql\Install;
+namespace Drupal\Core\Database\Driver\mysql\Install;
 
-use Drupal\Database\Install\Tasks as InstallTasks;
+use Drupal\Core\Database\Install\Tasks as InstallTasks;
 
 /**
  * Specifies installation tasks for MySQL and equivalent databases.

core/lib/Drupal/Core/Database/Driver/mysql/Merge.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\mysql;
+
+use Drupal\Core\Database\Query\Merge as QueryMerge;
+
+class Merge extends QueryMerge { }

core/lib/Drupal/Core/Database/Driver/mysql/Schema.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\Database\Driver\mysql;
+namespace Drupal\Core\Database\Driver\mysql;
 
-use Drupal\Database\Database;
-use Drupal\Database\Query\Condition;
-use Drupal\Database\SchemaObjectExistsException;
-use Drupal\Database\SchemaObjectDoesNotExistException;
-use Drupal\Database\Schema as DatabaseSchema;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Condition;
+use Drupal\Core\Database\SchemaObjectExistsException;
+use Drupal\Core\Database\SchemaObjectDoesNotExistException;
+use Drupal\Core\Database\Schema as DatabaseSchema;
 
 use Exception;
 

core/lib/Drupal/Core/Database/Driver/mysql/Select.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\mysql;
+
+use Drupal\Core\Database\Query\Select as QuerySelect;
+
+class Select extends QuerySelect { }

core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\mysql;
+
+use Drupal\Core\Database\Transaction as DatabaseTransaction;
+
+class Transaction extends DatabaseTransaction { }

core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\mysql;
+namespace Drupal\Core\Database\Driver\mysql;
 
-use Drupal\Database\Query\Truncate as QueryTruncate;
+use Drupal\Core\Database\Query\Truncate as QueryTruncate;
 
 class Truncate extends QueryTruncate {
   public function __toString() {

core/lib/Drupal/Core/Database/Driver/mysql/Update.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\mysql;
+
+use Drupal\Core\Database\Query\Update as QueryUpdate;
+
+class Update extends QueryUpdate { }

core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\pgsql\Install;
+namespace Drupal\Core\Database\Driver\pgsql\Install;
 
-use Drupal\Database\Install\Tasks as InstallTasks;
+use Drupal\Core\Database\Install\Tasks as InstallTasks;
 
 /**
  * PostgreSQL specific install functions

core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\Database;
-use Drupal\Database\TransactionNoActiveException;
-use Drupal\Database\TransactionNameNonUniqueException;
-use Drupal\Database\TransactionCommitFailedException;
-use Drupal\Database\Driver\sqlite\Statement;
-use Drupal\Database\Connection as DatabaseConnection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\TransactionNoActiveException;
+use Drupal\Core\Database\TransactionNameNonUniqueException;
+use Drupal\Core\Database\TransactionCommitFailedException;
+use Drupal\Core\Database\Driver\sqlite\Statement;
+use Drupal\Core\Database\Connection as DatabaseConnection;
 
 use PDO;
 use Exception;

core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\Query\Delete as QueryDelete;
+use Drupal\Core\Database\Query\Delete as QueryDelete;
 
 /**
  * SQLite specific implementation of DeleteQuery.

core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\Query\Insert as QueryInsert;
+use Drupal\Core\Database\Query\Insert as QueryInsert;
 
 /**
  * SQLite specific implementation of InsertQuery.

core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php

@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Drupal\Database\Driver\sqlite\Install;
+namespace Drupal\Core\Database\Driver\sqlite\Install;
 
-use Drupal\Database\Install\Tasks as InstallTasks;
+use Drupal\Core\Database\Install\Tasks as InstallTasks;
 
 use SplFileInfo;
 

core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\sqlite;
+
+use Drupal\Core\Database\Query\Merge as QueryMerge;
+
+class Merge extends QueryMerge { }

core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\SchemaObjectExistsException;
-use Drupal\Database\SchemaObjectDoesNotExistException;
-use Drupal\Database\Schema as DatabaseSchema;
+use Drupal\Core\Database\SchemaObjectExistsException;
+use Drupal\Core\Database\SchemaObjectDoesNotExistException;
+use Drupal\Core\Database\Schema as DatabaseSchema;
 
 use Exception;
 

core/lib/Drupal/Core/Database/Driver/sqlite/Select.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\Query\Select as QuerySelect;
+use Drupal\Core\Database\Query\Select as QuerySelect;
 
 class Select extends QuerySelect {
   public function forUpdate($set = TRUE) {

core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\StatementPrefetch;
-use Drupal\Database\StatementInterface;
+use Drupal\Core\Database\StatementPrefetch;
+use Drupal\Core\Database\StatementInterface;
 
 use Iterator;
 use PDOException;

core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\sqlite;
+
+use Drupal\Core\Database\Transaction as DatabaseTransaction;
+
+class Transaction extends DatabaseTransaction { }

core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\Query\Truncate as QueryTruncate;
+use Drupal\Core\Database\Query\Truncate as QueryTruncate;
 
 /**
  * SQLite specific implementation of TruncateQuery.

core/lib/Drupal/Core/Database/Driver/sqlite/Update.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Database\Driver\sqlite;
+namespace Drupal\Core\Database\Driver\sqlite;
 
-use Drupal\Database\Query\Condition;
-use Drupal\Database\Query\ConditionInterface;
-use Drupal\Database\Query\Update as QueryUpdate;
+use Drupal\Core\Database\Query\Condition;
+use Drupal\Core\Database\Query\ConditionInterface;
+use Drupal\Core\Database\Query\Update as QueryUpdate;
 
 /**
  * SQLite specific implementation of UpdateQuery.

core/lib/Drupal/Core/Database/DriverNotSpecifiedException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/Install/TaskException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Install;
+namespace Drupal\Core\Database\Install;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/Install/Tasks.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Install;
+namespace Drupal\Core\Database\Install;
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 use PDO;
 

core/lib/Drupal/Core/Database/Log.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Database query logger.

core/lib/Drupal/Core/Database/Query/AlterableInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 /**
  * Interface for a query that can be manipulated via an alter hook.

core/lib/Drupal/Core/Database/Query/Condition.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Connection;
 
 use Countable;
 

core/lib/Drupal/Core/Database/Query/ConditionInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Connection;
 
 /**
  * Interface for a conditional clause in a query.

core/lib/Drupal/Core/Database/Query/Delete.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 
 /**
  * General class for an abstracted DELETE operation.

core/lib/Drupal/Core/Database/Query/ExtendableInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 /**
  * Interface for extendable query objects.

core/lib/Drupal/Core/Database/Query/FieldsOverlapException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/Query/Insert.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * General class for an abstracted INSERT query.

core/lib/Drupal/Core/Database/Query/InvalidMergeQueryException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/Query/Merge.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 
 use Exception;
 

core/lib/Drupal/Core/Database/Query/NoFieldsException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 use Exception;
 

core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 /**
  * Interface for a query that accepts placeholders.

core/lib/Drupal/Core/Database/Query/Query.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 
 /**
  * Base class for query builders.

core/lib/Drupal/Core/Database/Query/Select.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 
 
 /**

core/lib/Drupal/Core/Database/Query/SelectExtender.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Connection;
 
 /**
  * The base extender class for Select queries.

core/lib/Drupal/Core/Database/Query/SelectInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
 /**
  * Interface definition for a Select Query object.

core/lib/Drupal/Core/Database/Query/Truncate.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 
 
 /**

core/lib/Drupal/Core/Database/Query/Update.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Database\Query;
+namespace Drupal\Core\Database\Query;
 
-use Drupal\Database\Database;
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 
 /**
  * General class for an abstracted UPDATE operation.

core/lib/Drupal/Core/Database/Schema.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
-use Drupal\Database\SchemaObjectExistsException;
-use Drupal\Database\Query\Condition;
-use Drupal\Database\Query\PlaceholderInterface;
+use Drupal\Core\Database\SchemaObjectExistsException;
+use Drupal\Core\Database\Query\Condition;
+use Drupal\Core\Database\Query\PlaceholderInterface;
 
 /**
  * @defgroup schemaapi Schema API

core/lib/Drupal/Core/Database/SchemaException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/SchemaObjectDoesNotExistException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception thrown if an object being modified doesn't exist yet.

core/lib/Drupal/Core/Database/SchemaObjectExistsException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception thrown if an object being created already exists.

core/lib/Drupal/Core/Database/StatementBase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use PDO;
 use PDOStatement;

core/lib/Drupal/Core/Database/StatementEmpty.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use Iterator;
 

core/lib/Drupal/Core/Database/StatementInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use Traversable;
 

core/lib/Drupal/Core/Database/StatementPrefetch.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
-use Drupal\Database\Connection;
+use Drupal\Core\Database\Connection;
 use Iterator;
 use PDO;
 use PDOException;

core/lib/Drupal/Core/Database/Transaction.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * A wrapper class for creating and managing database transactions.

core/lib/Drupal/Core/Database/TransactionCommitFailedException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception thrown when a commit() function fails.

core/lib/Drupal/Core/Database/TransactionException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 use RuntimeException;
 

core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception to deny attempts to explicitly manage transactions.

core/lib/Drupal/Core/Database/TransactionNameNonUniqueException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception thrown when a savepoint or transaction name occurs twice.

core/lib/Drupal/Core/Database/TransactionNoActiveException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception for when popTransaction() is called with no active transaction.

core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Database;
+namespace Drupal\Core\Database;
 
 /**
  * Exception thrown when a rollback() resulted in other active transactions being rolled-back.

core/modules/dblog/dblog.module

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/entity/entity.query.inc

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Query\Select;
+use Drupal\Core\Database\Query\Select;
 
 /**
  * @file

core/modules/field/modules/field_sql_storage/field_sql_storage.module

@@ -1,7 +1,7 @@
 <?php
 
-use Drupal\Database\Database;
-use Drupal\Database\Query\Select;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Select;
 
 /**
  * @file

core/modules/field/modules/field_sql_storage/field_sql_storage.test

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/node/node.admin.inc

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Query\SelectInterface;
+use Drupal\Core\Database\Query\SelectInterface;
 
 /**
  * @file

core/modules/node/node.module

@@ -1,8 +1,8 @@
 <?php
 
-use Drupal\Database\Query\AlterableInterface;
-use Drupal\Database\Query\SelectExtender;
-use Drupal\Database\Query\SelectInterface;
+use Drupal\Core\Database\Query\AlterableInterface;
+use Drupal\Core\Database\Query\SelectExtender;
+use Drupal\Core\Database\Query\SelectInterface;
 
 /**
  * @file

core/modules/node/node.test

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/search/search.extender.inc

@@ -1,7 +1,7 @@
 <?php
 
-use Drupal\Database\Query\SelectExtender;
-use Drupal\Database\StatementEmpty;
+use Drupal\Core\Database\Query\SelectExtender;
+use Drupal\Core\Database\StatementEmpty;
 
 /**
  * @file

core/modules/simpletest/drupal_web_test_case.php

@@ -1,7 +1,7 @@
 <?php
 
-use Drupal\Database\Database;
-use Drupal\Database\ConnectionNotDefinedException;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\ConnectionNotDefinedException;
 
 /**
  * Global variable that holds information about the tests being run.

core/modules/simpletest/simpletest.module

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/simpletest/tests/database_test.module

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Query\AlterableInterface;
+use Drupal\Core\Database\Query\AlterableInterface;
 
 /**
  * Implements hook_query_alter().

core/modules/simpletest/tests/database_test.test

@@ -1,13 +1,13 @@
 <?php
 
-use Drupal\Database\Database;
-use Drupal\Database\StatementEmpty;
-use Drupal\Database\StatementInterface;
-use Drupal\Database\TransactionOutOfOrderException;
-use Drupal\Database\TransactionNoActiveException;
-use Drupal\Database\Query\Merge;
-use Drupal\Database\Query\InvalidMergeQueryException;
-use Drupal\Database\Query\NoFieldsException;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\StatementEmpty;
+use Drupal\Core\Database\StatementInterface;
+use Drupal\Core\Database\TransactionOutOfOrderException;
+use Drupal\Core\Database\TransactionNoActiveException;
+use Drupal\Core\Database\Query\Merge;
+use Drupal\Core\Database\Query\InvalidMergeQueryException;
+use Drupal\Core\Database\Query\NoFieldsException;
 
 /**
  * Dummy class for fetching into a class.

core/modules/simpletest/tests/schema.test

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/simpletest/tests/upgrade/upgrade.test

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * Perform end-to-end tests of the upgrade path.

core/modules/system/system.install

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/system/system.test

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Database;
+use Drupal\Core\Database\Database;
 
 /**
  * @file

core/modules/user/user.module

@@ -1,6 +1,6 @@
 <?php
 
-use Drupal\Database\Query\SelectInterface;
+use Drupal\Core\Database\Query\SelectInterface;
 
 /**
  * @file