#364 - Sync with changes in 0.19.7

joomlatools · Mar 7, 2021 · f9052ad · f9052ad
1 parent 752187b
commit f9052ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/contrib/extensions/k2/model/articles.php b/contrib/extensions/k2/model/articles.php
@@ -14,8 +14,8 @@ public function __construct(KObjectConfig $config)
         parent::__construct($config);
 
         $this->getState()
-            ->insert('id'        , 'cmd', null, true)
-            ->insert('slug'      , 'cmd', null, true)
+            ->insertUnique('id'  , 'cmd')
+            ->insertUnique('slug', 'cmd')
             ->insert('category'  , 'cmd')
             ->insert('tags'      , 'cmd')
 
@@ -47,15 +47,15 @@ public function getAliases()
         return $this->getConfig()->aliases;
     }
 
-    public function fetchData($count = false)
+    public function getQuery($columns = true)
     {
         $state = $this->getState();
 
         $query = $this->getObject('database.query.select')
             ->table(array('tbl' => $this->getTable()->getName()));
 
         //#__content
-        if(!$count)
+        if($columns)
         {
             //#__tags
             $query->columns([

diff --git a/contrib/extensions/k2/model/attachments.php b/contrib/extensions/k2/model/attachments.php
@@ -14,7 +14,7 @@ public function __construct(KObjectConfig $config)
 		parent::__construct($config);
 
 		$this->getState()
-			->insert('id', 'cmd', null, true)
+			->insertUnique('id', 'cmd')
 			->insert('article', 'int');
 	}
 
@@ -29,14 +29,14 @@ protected function _initialize(KObjectConfig $config)
 		parent::_initialize($config);
 	}
 
-	public function fetchData($count = false)
+	public function getQuery($columns = true)
 	{
 		$state = $this->getState();
 
 		$query = $this->getObject('database.query.select')
 			->table(array('tbl' => $this->getTable()->getName()));
 
-		if(!$count)
+		if($columns)
 		{
 			$query->columns([
 				'id'      => 'tbl.id',

diff --git a/contrib/extensions/k2/model/categories.php b/contrib/extensions/k2/model/categories.php
@@ -14,7 +14,7 @@ public function __construct(KObjectConfig $config)
         parent::__construct($config);
 
         $this->getState()
-            ->insert('id'        , 'cmd', null, true)
+            ->insertUnique('id'  , 'cmd')
             ->insert('published' , 'boolean')
             ->insert('access'    , 'cmd', array_unique($this->getObject('user')->getRoles()))
         ;
@@ -31,15 +31,15 @@ protected function _initialize(KObjectConfig $config)
         parent::_initialize($config);
     }
 
-    public function fetchData($count = false)
+    public function getQuery($columns = true)
     {
         $state = $this->getState();
 
         $query = $this->getObject('database.query.select')
             ->table(array('tbl' => $this->getTable()->getName()));
 
         //#__k2_categories
-        if(!$count)
+        if($columns)
         {
             $query->columns([
                 'id'       => 'tbl.id',

diff --git a/contrib/extensions/k2/model/fields.php b/contrib/extensions/k2/model/fields.php
@@ -14,7 +14,7 @@ public function __construct(KObjectConfig $config)
         parent::__construct($config);
 
         $this->getState()
-            ->insert('id', 'cmd', null, true)
+            ->insertUnique('id', 'cmd')
             ->insert('group'     , 'int')
             ->insert('published' , 'boolean');
     }
@@ -30,14 +30,14 @@ protected function _initialize(KObjectConfig $config)
         parent::_initialize($config);
     }
 
-    public function fetchData($count = false)
+    public function getQuery($columns = true)
     {
         $state = $this->getState();
 
         $query = $this->getObject('database.query.select')
             ->table(array('tbl' => $this->getTable()->getName()));
 
-        if(!$count)
+        if($columns)
         {
             $query->columns([
                 'id'        => 'tbl.id',