Feature/nex 136/configure spanner

common/ext/class.GenerisInstaller.php

@@ -48,12 +48,16 @@ public function install()
         }
 
         $this->installLoadDefaultConfig();
-
+
+        // Id of the writable model.
+        $modelFactory = new \core_kernel_api_ModelFactory();
+        $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
         ));

common/ext/class.Namespace.php

@@ -1,169 +1,117 @@
-<?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) 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);
- * 
- */
+<?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) 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);
+ *
+ */
 
 /**
  * Short description of class common_ext_Namespace
  *
- * @access public
- * @author Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
+ * @access  public
+ * @author  Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
  * @package generis
-
  */
 class common_ext_Namespace
 {
-    // --- ASSOCIATIONS ---
-    // generateAssociationEnd : 
-
-    // --- ATTRIBUTES ---
-
     /**
      * A unique identifier of the namespace
      *
-     * @access protected
-     * @var int
+     * @var string
      */
-    protected $modelId = 0;
+    protected $modelId;
 
     /**
      * the namespace URI
      *
-     * @access protected
      * @var string
      */
-    protected $uri = '';
-
-    // --- OPERATIONS ---
+    protected $uri;
 
     /**
-     * Create a namespace instance
+     * Namespace constructor.
      *
-     * @access public
      * @author Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
-     * @param  int id
+     *
+     * @param  string id
      * @param  string uri
-     * @return mixed
      */
-    public function __construct($id = 0, $uri = '')
+    public function __construct($id = '', $uri = '')
     {
-
-
-    	if($id > 0){
-    		$this->modelId = $id;
-    	}
-    	if(!empty($uri)){
-    		$this->uri = $uri;
-    	}
-
-
+        $this->modelId = $id;
+        $this->uri = $uri;
     }
 
     /**
      * Get the identifier of the namespace instance
      *
-     * @access public
      * @author Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
-     * @return int
+     * @return string
      */
     public function getModelId()
     {
-        $returnValue = (int) 0;
-
-
-
-        $returnValue = $this->modelId;
-
-
-
-        return (int) $returnValue;
+        return $this->modelId;
     }
 
     /**
      * Get the namespace URI
      *
-     * @access public
      * @author Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
      * @return string
      */
     public function getUri()
     {
-        $returnValue = (string) '';
-
-
-
-        $returnValue = $this->uri;
-
-
-
-        return (string) $returnValue;
+        return $this->uri;
     }
 
     /**
      * Magic method, return the Namespace URI
      *
-     * @access public
      * @author Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
      * @return string
      */
     public function __toString()
     {
-        $returnValue = (string) '';
-
-
-
-        $returnValue = $this->getUri();
-
-
-
-        return (string) $returnValue;
+        return $this->getUri();
     }
 
     /**
      * Remove a namespace from the ontology. All triples bound to the model will
      * be removed.
      *
-     * @access public
      * @author Jerome Bogaerts, <jerome.bogaerts@tudor.lu>
+     *
      * @return boolean
+     * @throws core_kernel_persistence_Exception
      */
     public function remove()
     {
-        $returnValue = (bool) false;
-
-
         $db = core_kernel_classes_DbWrapper::singleton();
-        if (false === $db->exec("DELETE FROM statements WHERE modelid = ?", array($this->getModelId()))){
-        	$returnValue = false;
+
+        // TODO refactor this to use triple store abstraction.
+        if (false === $db->exec("DELETE FROM statements WHERE modelid = ?", [$this->getModelId()])) {
+            return false;
         }
-        else{
-        	if (false === $db->exec("DELETE FROM models WHERE modelid = ?", array($this->getModelId()))){
-        		$returnValue = false;
-        	}
-        	else{
-        		$returnValue = true;
-        	}
+
+        // TODO refactor this to use triple store abstraction.
+        if (false === $db->exec("DELETE FROM models WHERE modelid = ?", [$this->getModelId()])) {
+            return false;
         }
-
-
 
-        return (bool) $returnValue;
+        return true;
     }
-
-}
+}

common/persistence/class.SqlPersistence.php

@@ -64,6 +64,7 @@ public function getPlatForm(){
      * @author "Lionel Lecaque, <lionel@taotesting.com>"
      * @param string $tableName
      * @param array $data
+     * @return int
      */
     public function insert($tableName, array $data)
     {

common/persistence/sql/class.Platform.php

@@ -152,10 +152,7 @@ public function getName(){
      * @return string
      */
     public function getNowExpression(){
-        $datetime = new DateTime('now', new \DateTimeZone('UTC'));
-        $date = $datetime->format('Y-m-d H:i:s');
-       // return $this->dbalPlatform->getNowExpression();
-       return $date;
+        return $this->dbalPlatform->getNowExpression();
     }
 
     /**

composer.json

@@ -53,16 +53,24 @@
   "extra": {
     "tao-extension-name": "generis"
   },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "git@github.com:oat-sa/lib-dbal-spanner.git"
+    }
+  ],
   "require": {
     "clearfw/clearfw": "~1.2.0",
     "easyrdf/easyrdf": "^0.9.0",
-    "doctrine/dbal": "~2.5.0",
+    "doctrine/dbal": "^2.9.0",
+    "doctrine/annotations": "1.*",
     "zendframework/zend-servicemanager": "~2.5.0",
     "league/flysystem": "~1.0",
     "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": "dev-feature/NEX-84/spanner-compatible-statements",
+    "oat-sa/lib-dbal-spanner": "dev-feature/NEX-84/spanner-query-refactoring",
     "monolog/monolog": "^1.23.0",
     "fluent/logger": "^1.0.1",
     "symfony/lock": "^3.4",
@@ -90,5 +98,6 @@
     "psr-4": {
       "oat\\generis\\test\\": "generis/test/"
     }
-  }
+  },
+  "minimum-stability" : "dev"
 }