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 <jeroended...@gmail.com>
Gerrit-Reviewer: Anja Jentzsch <a...@anjeve.de>
Gerrit-Reviewer: Ataherivand <abraham.taheriv...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Denny Vrandecic <denny.vrande...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Jens Ohlig <jens.oh...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: John Erling Blad <jeb...@gmail.com>
Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Markus Kroetzsch <mar...@semantic-mediawiki.org>
Gerrit-Reviewer: Nikola Smolenski <smole...@eunet.rs>
Gerrit-Reviewer: Silke Meyer <silke.me...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
