Feature/nex 136/configure spanner

common/class.Collection.php

@@ -347,4 +347,4 @@ public function toArray()
         return (array) $returnValue;
     }
 
-}
+}

common/class.Utils.php

@@ -1,7 +1,4 @@
 <?php
-use oat\oatbox\PhpSerializable;
-use oat\oatbox\service\ServiceManager;
-use oat\generis\model\kernel\uri\UriProvider;
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,6 +19,9 @@
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
  *
  */
+use oat\oatbox\PhpSerializable;
+use oat\oatbox\service\ServiceManager;
+use oat\generis\model\kernel\uri\UriProvider;
 
 /**
  *

common/ext/class.GenerisInstaller.php

@@ -16,30 +16,22 @@
  * 
  * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- * 				 2013-2014 (update and modification) Open Assessment Technologies SA;
- * 
+ * 				 2013-2019 (update and modification) Open Assessment Technologies SA;
  */
+
+use core_kernel_api_ModelFactory as ModelFactory;
 use oat\generis\model\data\ModelManager;
 use oat\generis\model\kernel\persistence\smoothsql\search\ComplexSearchService;
-use oat\oatbox\service\ServiceManager;
 
 /**
  * Custom extension installer for generis
- *
- * @access public
- * @author Joel Bout, <joel.bout@tudor.lu>
- * @package generis
- *         
  */
 class common_ext_GenerisInstaller extends common_ext_ExtensionInstaller
 {
-
     /**
      * Setup the ontology configuration
-     *
-     * @access public
-     * @author Joel Bout, <joel.bout@tudor.lu>
      * @return mixed
+     * @throws common_ext_ExtensionException
      */
     public function install()
     {
@@ -48,16 +40,21 @@ public function install()
         }
 
         $this->installLoadDefaultConfig();
-
+
+        // Id of the writable model.
+        /** @var ModelFactory $modelFactory */
+        $modelFactory = $this->getServiceManager()->get(ModelFactory::SERVICE_ID);
+        $writableModelId = $modelFactory->getModelId(LOCAL_NAMESPACE);
+
         $model = new \core_kernel_persistence_smoothsql_SmoothModel(array(
             \core_kernel_persistence_smoothsql_SmoothModel::OPTION_PERSISTENCE => 'default',
-            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_READABLE_MODELS => array('1'),
-            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_WRITEABLE_MODELS => array('1'),
-            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_NEW_TRIPLE_MODEL => '1',
+            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_READABLE_MODELS => [$writableModelId],
+            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_WRITEABLE_MODELS => [$writableModelId],
+            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_NEW_TRIPLE_MODEL => $writableModelId,
             \core_kernel_persistence_smoothsql_SmoothModel::OPTION_SEARCH_SERVICE => ComplexSearchService::SERVICE_ID,
             \core_kernel_persistence_smoothsql_SmoothModel::OPTION_CACHE_SERVICE => common_cache_Cache::SERVICE_ID
         ));
-        $model->setServiceLocator(ServiceManager::getServiceManager());
+        $model->setServiceLocator($this->getServiceManager());
         ModelManager::setModel($model);
 
         $this->installOntology();

common/persistence/class.Persistence.php

@@ -21,6 +21,7 @@
  * @package generis
  *
  */
+
 abstract class common_persistence_Persistence
 {
     /**
@@ -102,15 +103,5 @@ protected function getParams(){
     protected function setParams($params){
         $this->params = $params;
     }
-
-    /**
-     * Generates a unique, not auto-increment based, primary key.
-     *
-     * @return string
-     */
-    public function getUniquePrimaryKey()
-    {
-        return strrev(uniqid('', true));
-    }
 }
 

common/persistence/sql/SetupDb.php

@@ -20,16 +20,19 @@
  * @license GPLv2
  * @package tao
  */
+
 namespace oat\generis\persistence\sql;
 
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use oat\oatbox\log\LoggerAwareTrait;
+use oat\oatbox\service\ConfigurableService;
 use Psr\Log\LoggerAwareInterface;
 use Doctrine\DBAL\Schema\Schema;
 use oat\generis\model\kernel\persistence\smoothsql\install\SmoothRdsModel;
 use Doctrine\DBAL\Exception\ConnectionException;
+use common_persistence_SqlPersistence as Persistence;
 
-class SetupDb implements LoggerAwareInterface
+class SetupDb extends ConfigurableService implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
@@ -38,7 +41,7 @@ class SetupDb implements LoggerAwareInterface
      * @param \common_persistence_SqlPersistence $p
      * @throws \common_exception_InconsistentData
      */
-    public function setupDatabase(\common_persistence_SqlPersistence $p)
+    public function setupDatabase(Persistence $p)
     {
         $dbalDriver = $p->getDriver();
         if (!$dbalDriver instanceof \common_persistence_sql_dbal_Driver) {
@@ -50,21 +53,15 @@ public function setupDatabase(\common_persistence_SqlPersistence $p)
         $this->setupTables($p);
     }
 
-    /**
-     * @author "Lionel Lecaque, <lionel@taotesting.com>"
-     */
-    private function verifyDatabase(\common_persistence_SqlPersistence $p, $dbName)
+    private function verifyDatabase(Persistence $p, $dbName)
     {
         $schemaManager = $p->getSchemaManager()->getDbalSchemaManager();
         if (!$this->dbExists($schemaManager, $dbName)) {
             throw new \tao_install_utils_Exception('Unable to find the database, make sure that the db exists and that the db user has the rights to use it.');
         }
     }
 
-    /**
-     * @author "Lionel Lecaque, <lionel@taotesting.com>"
-     */
-    private function setupTables(\common_persistence_SqlPersistence $p)
+    private function setupTables(Persistence $p)
     {
         $queries = $p->getPlatForm()->schemaToSql($this->getSchema($p));
         foreach ($queries as $query){
@@ -76,10 +73,11 @@ private function setupTables(\common_persistence_SqlPersistence $p)
      * Generate databse schema
      * @return Schema
      */
-    public function getSchema(\common_persistence_SqlPersistence $p)
+    public function getSchema(Persistence $p)
     {
         $schema = $p->getSchemaManager()->createSchema();
-        SmoothRdsModel::addSmoothTables($schema);
+        $smoothRdsModel = $this->getServiceLocator()->get(SmoothRdsModel::class); 
+        $smoothRdsModel->addSmoothTables($schema);
         $this->addKeyValueStoreTable($schema);
         return $schema;
     }
@@ -99,8 +97,9 @@ protected function addKeyValueStoreTable(Schema $schema)
     }
 
     /**
-     * @author "Lionel Lecaque, <lionel@taotesting.com>"
+     * @param AbstractSchemaManager $schemaManager
      * @param string $dbName
+     * @return bool
      */
     private function dbExists(AbstractSchemaManager $schemaManager, $dbName)
     {
@@ -112,10 +111,7 @@ private function dbExists(AbstractSchemaManager $schemaManager, $dbName)
         }
     }
 
-    /**
-     * @author "Lionel Lecaque, <lionel@taotesting.com>"
-     */
-    private function cleanDb(\common_persistence_SqlPersistence $p)
+    private function cleanDb(Persistence $p)
     {
         $schema = $p->getSchemaManager()->createSchema();
         $queries = $p->getPlatForm()->toDropSql($schema);

composer.json

@@ -63,11 +63,12 @@
     "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
     "php": "^7.1",
     "psr/log": "~1.0",
-    "oat-sa/lib-generis-search": "^2.0.1",
+    "oat-sa/lib-generis-search": "^2.1.0",
     "monolog/monolog": "^1.23.0",
     "fluent/logger": "^1.0.1",
     "symfony/lock": "^3.4",
-    "psr/container": "^1.0.0"
+    "psr/container": "^1.0.0",
+    "ramsey/uuid": "3.8.0"
   },
   "require-dev": {
     "mikey179/vfsstream": "1.4.0",

core/kernel/api/NewSqlModelFactory.php

@@ -0,0 +1,119 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2019 (original work) Open Assessment Technologies SA
+ */
+
+namespace oat\generis\model\kernel\api;
+
+use core_kernel_api_ModelFactory as ModelFactory;
+use Doctrine\DBAL\Schema\Schema;
+use oat\generis\Helper\UuidPrimaryKeyTrait;
+use RuntimeException;
+
+class NewSqlModelFactory extends ModelFactory
+{
+    use UuidPrimaryKeyTrait;
+
+    /**
+     * @inheritdoc
+     */
+    public function addNewModel($namespace)
+    {
+        $modelId = md5($namespace);
+
+        if ($this->getPersistence()->insert('models', ['modelid' => $modelId, 'modeluri' => $namespace]) === 0) {
+            throw new RuntimeException('A problem occurred while creating a new model.');
+        }
+        return $modelId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepareStatement($modelId, $subject, $predicate, $object, $lang, $author)
+    {
+        $date = $this->getPersistence()->getPlatForm()->getNowExpression();
+
+        return [
+            'id' => $this->getUniquePrimaryKey(),
+            'modelid' => $modelId,
+            'subject' => $subject,
+            'predicate' => $predicate,
+            'object' => $object,
+            'l_language' => $lang,
+            'author' => $author ?? '',
+            'epoch' => $date,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function buildModelSqlCondition(array $models)
+    {
+        $models = array_map(
+            function ($a) {
+                return "'" . $a . "'";
+            },
+            $models
+        );
+        return parent::buildModelSqlCondition($models);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPropertySortingField()
+    {
+        return 'epoch';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createModelsTable(Schema $schema)
+    {
+        $table = $schema->createTable('models');
+        $table->addColumn('modelid', 'string', ['length' => 36, 'notnull' => true]);
+        $table->addColumn('modeluri', 'string', ['length' => 255]);
+        $table->setPrimaryKey(['modelid']);
+
+        return $table;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createStatementsTable(Schema $schema)
+    {
+        $table = $schema->createTable('statements');
+        $table->addColumn('id', 'string', ['length' => 36, 'notnull' => true]);
+        $table->addColumn('modelid', 'string', ['length' => 23, 'notnull' => true]);
+        $table->addColumn('subject', 'string', ['length' => 255]);
+        $table->addColumn('predicate', 'string', ['length' => 255]);
+        $table->addColumn('object', 'text', []);
+        $table->addColumn('l_language', 'string', ['length' => 255]);
+        $table->addColumn('author', 'string', ['length' => 255]);
+        $table->addColumn('epoch', 'string', ['notnull' => true]);
+
+        $table->setPrimaryKey(['id']);
+        $table->addIndex(['subject', 'predicate'], 'k_sp');
+        $table->addIndex(['predicate', 'object'], 'k_po');
+
+        return $table;
+    }
+}