[skip ci] fail to merge

pluf · Sep 11, 2020 · 1ab5692 · 1ab5692
1 parent 00f755d
commit 1ab5692
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/src6/Db/Engine.php b/src6/Db/Engine.php
@@ -3,7 +3,6 @@
 
 use Pluf\Options;
 use Pluf\Data\Schema;
-use Pluf_Utils;
 use WKT;
 use geoPHP;
 
@@ -337,7 +336,7 @@ public static function passwordToDb($val, $db)
             return $val;
         }
         // We need to hash the value.
-        $salt = Pluf_Utils::getRandomString(5);
+        $salt = \Pluf\Utils::getRandomString(5);
         return 'sha1:' . $salt . ':' . sha1($salt . $val);
     }
 

diff --git a/src6/Db/Schema.php b/src6/Db/Schema.php
@@ -2,10 +2,9 @@
 namespace Pluf\Db;
 
 use Pluf\Options;
+use Pluf\Pluf\Tenant;
 use Pluf;
 use Pluf_Model;
-use Pluf_SQL;
-use Pluf_Tenant;
 
 /**
  * Create the schema of a given Pluf_Model for a given database.
@@ -101,7 +100,7 @@ public function getRelationTable(Pluf_Model $from, Pluf_Model $to, ?string $rela
     public function createQuery(Pluf_Model $model)
     {
         if (Pluf::f('multitenant', false) && $model->_a['multitenant']) {
-            $model->tenant = Pluf_Tenant::getCurrent();
+            $model->tenant = Tenant::getCurrent();
         }
 
         // $engine = $model->getEngine();

diff --git a/src6/Pluf/Search.php b/src6/Pluf/Search.php
@@ -25,7 +25,6 @@
 use Pluf\Pluf\Search\Word;
 use Exception;
 use Pluf;
-use Pluf_SQL;
 
 /**
  * Class implementing a small search engine.
@@ -185,10 +184,10 @@ public static function index($doc, $stemmer = 'Pluf_Text_Stemmer_Porter')
         }
         // Drop the last indexation.
         $gocc = new Occ();
-        $sql = new Pluf_SQL('DELETE FROM ' . $gocc->getSqlTable() . ' WHERE model_class=%s AND model_id=%s', array(
-            $doc->_model,
-            $doc->id
-        ));
+//         $sql = new Pluf_SQL('DELETE FROM ' . $gocc->getSqlTable() . ' WHERE model_class=%s AND model_id=%s', array(
+//             $doc->_model,
+//             $doc->id
+//         ));
         $db = &Pluf::db();
         $db->execute($sql->gen());
         // Get the ids for each word.
@@ -230,10 +229,10 @@ public static function index($doc, $stemmer = 'Pluf_Text_Stemmer_Porter')
             $occ->create();
         }
         // update the stats
-        $sql = new Pluf_SQL('model_class=%s AND model_id=%s', array(
-            $doc->_model,
-            $doc->id
-        ));
+//         $sql = new Pluf_SQL('model_class=%s AND model_id=%s', array(
+//             $doc->_model,
+//             $doc->id
+//         ));
         $last_index = Pluf::factory(Stats::class)->getList(array(
             'filter' => $sql->gen()
         ));

diff --git a/src6/Pluf/Session.php b/src6/Pluf/Session.php
@@ -68,14 +68,8 @@ function init()
         $this->_a['cols'] = array(
             // It is mandatory to have an "id" column.
             'id' => array(
-<<<<<<< HEAD:src6/Pluf/Session.php
                 'type' => Schema::SEQUENCE,
                 'blank' => true
-=======
-                'type' => 'Sequence',
-                // It is automatically added.
-                'is_null' => false
->>>>>>> 93ec36415c2420a23445480ce9e3ac27f04bf0e1:src/Pluf/Session.php
             ),
             'version' => array(
                 'type' => 'Integer',