Denny Vrandecic has submitted this change and it was merged.
Change subject: Take care of TableBuilder TODO in QueryEngine component
..
Take care of TableBuilder TODO in QueryEngine component
Change-Id: I8599380fdc8b931a112eae98213ee402a855982d
---
M QueryEngine/includes/SQLStore/Factory.php
M QueryEngine/includes/SQLStore/Store.php
M QueryEngine/tests/phpunit/SQLStore/FactoryTest.php
3 files changed, 12 insertions(+), 23 deletions(-)
Approvals:
Denny Vrandecic: Looks good to me, approved
jenkins-bot: Verified
diff --git a/QueryEngine/includes/SQLStore/Factory.php
b/QueryEngine/includes/SQLStore/Factory.php
index c00562c..c07f695 100644
--- a/QueryEngine/includes/SQLStore/Factory.php
+++ b/QueryEngine/includes/SQLStore/Factory.php
@@ -3,6 +3,7 @@
namespace Wikibase\QueryEngine\SQLStore;
use Wikibase\Database\QueryInterface;
+use Wikibase\Database\TableBuilder;
use Wikibase\QueryEngine\SQLStore\ClaimStore\ClaimInserter;
use Wikibase\QueryEngine\SQLStore\ClaimStore\ClaimRowBuilder;
use Wikibase\QueryEngine\SQLStore\ClaimStore\ClaimsTable;
@@ -154,4 +155,8 @@
);
}
+ public function getTableBuilder() {
+ return new TableBuilder( $this->queryInterface );
+ }
+
}
diff --git a/QueryEngine/includes/SQLStore/Store.php
b/QueryEngine/includes/SQLStore/Store.php
index ac14857..68a7cfa 100644
--- a/QueryEngine/includes/SQLStore/Store.php
+++ b/QueryEngine/includes/SQLStore/Store.php
@@ -4,7 +4,6 @@
use MessageReporter;
use Wikibase\Database\QueryInterface;
-use Wikibase\Database\TableBuilder;
use Wikibase\QueryEngine\QueryStore;
use Wikibase\QueryEngine\SQLStore\Engine\DescriptionMatchFinder;
use Wikibase\QueryEngine\SQLStore\Engine\Engine;
@@ -54,13 +53,6 @@
/**
* @since 0.1
*
-* @var TableBuilder|null
-*/
- private $tableBuilder;
-
- /**
-* @since 0.1
-*
* @var Factory
*/
private $factory;
@@ -75,21 +67,6 @@
$this->config = $config;
$this->queryInterface = $queryInterface;
$this->factory = new Factory( $config, $queryInterface );
-
- $this->tableBuilder = new TableBuilder( $this->queryInterface );
- }
-
- /**
-* Sets the table builder to use for creating tables.
-*
-* @deprecated TODO: move to config
-*
-* @since 0.1
-*
-* @param TableBuilder $tableBuilder
-*/
- public function setTableBuilder( TableBuilder $tableBuilder ) {
- $this->tableBuilder = $tableBuilder;
}
/**
diff --git a/QueryEngine/tests/phpunit/SQLStore/FactoryTest.php
b/QueryEngine/tests/phpunit/SQLStore/FactoryTest.php
index 72cbb59..7081b5c 100644
--- a/QueryEngine/tests/phpunit/SQLStore/FactoryTest.php
+++ b/QueryEngine/tests/phpunit/SQLStore/FactoryTest.php
@@ -83,4 +83,11 @@
);
}
+ public function testGetTableBuilderReturnType() {
+ $this->assertInstanceOf(
+ 'Wikibase\Database\TableBuilder',
+ $this->newInstance()->getTableBuilder()
+ );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/64944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8599380fdc8b931a112eae98213ee402a855982d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw
Gerrit-Reviewer: Anja Jentzsch
Gerrit-Reviewer: Ataherivand
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Daniel Werner
Gerrit-Reviewer: Denny Vrandecic
Gerrit-Reviewer: Henning Snater
Gerrit-Reviewer: Jens Ohlig
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: John Erling Blad
Gerrit-Reviewer: Lydia Pintscher
Gerrit-Reviewer: Markus Kroetzsch
Gerrit-Reviewer: Nikola Smolenski
Gerrit-Reviewer: Silke Meyer
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
