get persistence from ontology model

composer.json

@@ -62,7 +62,7 @@
 		"oat-sa/oatbox-extension-installer": "dev-master",
 		"php" : ">=5.3.2",
 		"psr/log": "~1.0",
-		"oat-sa/lib-generis-search": "2.0.1"
+		"oat-sa/lib-generis-search": "2.1.0"
 	},
 	"replace": {
      		"oat-sa/generis":"dev-master"

core/kernel/persistence/smoothsql/search/GateWay.php

@@ -65,12 +65,21 @@ class GateWay extends TaoSearchGateWay {
     protected $resultSetClassName = '\\oat\\generis\\model\\kernel\\persistence\\smoothsql\\search\\TaoResultSet';
 
     public function __construct() {
-        $this->connector = ServiceManager::getServiceManager()
-                ->get(common_persistence_Manager::SERVICE_ID)
-                ->getPersistenceById('default');
+
     }
 
+    public function init()
+    {
+        $options = $this->getServiceLocator()->get('search.options');
         /**
+         * @var $model \core_kernel_persistence_smoothsql_SmoothModel
+         */
+        $model   = $options['model'];
+        $this->persistence = $model->getPersistence();
+        return parent::init();
+    }
+
+    /**
      * try to connect to database. throw an exception
      * if connection failed.
      *

core/kernel/persistence/smoothsql/search/driver/TaoSearchDriver.php

@@ -25,11 +25,22 @@ class TaoSearchDriver extends EscaperAbstract {
     protected $persistence;
 
     public function __construct() {
-        $this->persistence = ServiceManager::getServiceManager()
-                ->get(\common_persistence_Manager::SERVICE_ID)
-                ->getPersistenceById('default');
+
     }
-
+
+    public function getPersistence() {
+        if(is_null($this->persistence)) {
+            $options = $this->getOptions();
+            /**
+             * @var $model \core_kernel_persistence_smoothsql_SmoothModel
+             */
+            $model   = $options['model'];
+            $this->persistence = $model->getPersistence();
+        }
+
+        return $this->persistence;
+    }
+
     /**
      * @inherit
      */
@@ -47,21 +58,21 @@ public function escape($stringValue) {
      * return quoted empty string 
      */
     public function getEmpty() {
-        return $this->persistence->getPlatForm()->getNullString();
+        return $this->getPersistence()->getPlatForm()->getNullString();
     }
 
     /**
      * @inherit
      */
     public function quote($stringValue) {
-        return $this->persistence->quote($stringValue);
+        return $this->getPersistence()->quote($stringValue);
     }
 
     /**
      * @inherit
      */
     public function reserved($stringValue) {
-        return $this->persistence->getPlatForm()->quoteIdentifier($stringValue);
+        return $this->getPersistence()->getPlatForm()->quoteIdentifier($stringValue);
     }
 
     /**
@@ -73,7 +84,7 @@ public function random() {
             'postgresql' => 'random()', 
             'mssql'      => 'NEWID()',
             ];
-        $name = $this->persistence->getPlatForm()->getName();
+        $name = $this->getPersistence()->getPlatForm()->getName();
         return $random[$name]; 
     }
 
@@ -84,7 +95,7 @@ public function groupAggregation($variable , $separator) {
             'postgresql' => 'string_agg',
         ];
 
-        $name = $this->persistence->getPlatForm()->getName();
+        $name = $this->getPersistence()->getPlatForm()->getName();
         return $group[$name] . '(' . $variable . ',' . $this->escape($this->quote($separator)) . ')'; 
     }
 
@@ -98,7 +109,7 @@ public function like() {
             'postgresql' => 'ILIKE',
         ];
 
-        $name = $this->persistence->getPlatForm()->getName();
+        $name = $this->getPersistence()->getPlatForm()->getName();
         return $like[$name];
     }
 

manifest.php

@@ -31,7 +31,7 @@
     'label' => 'Generis Core',
     'description' => 'Core extension, provide the low level framework and an API to manage ontologies',
     'license' => 'GPL-2.0',
-    'version' => '4.1.2',
+    'version' => '4.2.0',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(),
     'models' => array(

scripts/update/Updater.php

@@ -390,7 +390,7 @@ public function update($initialVersion) {
             $this->setVersion('3.35.2');
         }
 
-        $this->skip('3.35.2', '4.1.2');
+        $this->skip('3.35.2', '4.2.0');
     }
 
     private function getReadableModelIds() {