Skip to content
Snippets Groups Projects
Commit d299b87a authored by Josh Pollock's avatar Josh Pollock
Browse files

Clean up code

parent 730e9c32
Branches
Tags
No related merge requests found
...@@ -23,6 +23,4 @@ trait UsersMockFormAsDBForm ...@@ -23,6 +23,4 @@ trait UsersMockFormAsDBForm
$this->mock_form = \Caldera_Forms_Forms::get_form($this->mock_form_id); $this->mock_form = \Caldera_Forms_Forms::get_form($this->mock_form_id);
parent::setUp(); parent::setUp();
} }
} }
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Tests\Unit\Delete; namespace calderawp\CalderaFormsQuery\Tests\Unit\Delete;
use calderawp\CalderaFormsQuery\Delete\DeleteQueryBuilder; use calderawp\CalderaFormsQuery\Delete\DeleteQueryBuilder;
use calderawp\CalderaFormsQuery\MySqlBuilder; use calderawp\CalderaFormsQuery\MySqlBuilder;
use calderawp\CalderaFormsQuery\Tests\Unit\TestCase; use calderawp\CalderaFormsQuery\Tests\Unit\TestCase;
...@@ -40,7 +39,6 @@ class DeleteQueryBuilderTest extends TestCase ...@@ -40,7 +39,6 @@ class DeleteQueryBuilderTest extends TestCase
$entryValues = $this->entryValuesDeleteGeneratorFactory(); $entryValues = $this->entryValuesDeleteGeneratorFactory();
$this->assertTrue(is_a($entryValues->getBuilder(), MySqlBuilder::class)); $this->assertTrue(is_a($entryValues->getBuilder(), MySqlBuilder::class));
} }
/** /**
...@@ -56,7 +54,6 @@ class DeleteQueryBuilderTest extends TestCase ...@@ -56,7 +54,6 @@ class DeleteQueryBuilderTest extends TestCase
$entryValues = $this->entryValuesDeleteGeneratorFactory(); $entryValues = $this->entryValuesDeleteGeneratorFactory();
$this->assertTrue(is_a($entryValues->getDeleteQuery(), Delete::class)); $this->assertTrue(is_a($entryValues->getDeleteQuery(), Delete::class));
} }
/** /**
......
...@@ -3,7 +3,12 @@ ...@@ -3,7 +3,12 @@
namespace calderawp\CalderaFormsQuery; namespace calderawp\CalderaFormsQuery;
interface DoesQueries /**
* Interface CreatesSqlQueries
*
* Interface that all classes that create SQL queries MUST impliment
*/
interface CreatesSqlQueries
{ {
/** /**
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Delete; namespace calderawp\CalderaFormsQuery\Delete;
use calderawp\CalderaFormsQuery\QueryBuilder; use calderawp\CalderaFormsQuery\QueryBuilder;
use NilPortugues\Sql\QueryBuilder\Manipulation\Delete; use NilPortugues\Sql\QueryBuilder\Manipulation\Delete;
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Delete; namespace calderawp\CalderaFormsQuery\Delete;
use NilPortugues\Sql\QueryBuilder\Manipulation\Delete; use NilPortugues\Sql\QueryBuilder\Manipulation\Delete;
/** /**
...@@ -20,5 +19,4 @@ interface DoesDeleteQuery ...@@ -20,5 +19,4 @@ interface DoesDeleteQuery
* @return Delete * @return Delete
*/ */
public function getCurrentQuery(); public function getCurrentQuery();
} }
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Delete; namespace calderawp\CalderaFormsQuery\Delete;
class Entry extends DeleteQueryBuilder class Entry extends DeleteQueryBuilder
{ {
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Delete; namespace calderawp\CalderaFormsQuery\Delete;
class EntryValues extends DeleteQueryBuilder class EntryValues extends DeleteQueryBuilder
{ {
...@@ -45,5 +44,4 @@ class EntryValues extends DeleteQueryBuilder ...@@ -45,5 +44,4 @@ class EntryValues extends DeleteQueryBuilder
->equals('slug', $fieldSlug); ->equals('slug', $fieldSlug);
return $this; return $this;
} }
} }
...@@ -6,6 +6,11 @@ namespace calderawp\CalderaFormsQuery; ...@@ -6,6 +6,11 @@ namespace calderawp\CalderaFormsQuery;
use calderawp\CalderaFormsQuery\Select\Entry; use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Select\EntryValues; use calderawp\CalderaFormsQuery\Select\EntryValues;
/**
* Class EntryQueries
*
* Used to query entry data, using SQL created by genrators
*/
class EntryQueries implements QueriesEntries class EntryQueries implements QueriesEntries
{ {
/** /**
......
...@@ -33,8 +33,8 @@ class Escape ...@@ -33,8 +33,8 @@ class Escape
* @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare() * @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare()
* or real_escape next. * or real_escape next.
*/ */
public static function like( $text ) { public static function like($text)
{
return addcslashes($text, '_%\\'); return addcslashes($text, '_%\\');
} }
} }
...@@ -6,6 +6,11 @@ namespace calderawp\CalderaFormsQuery; ...@@ -6,6 +6,11 @@ namespace calderawp\CalderaFormsQuery;
use calderawp\CalderaFormsQuery\Select\Entry; use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Select\EntryValues; use calderawp\CalderaFormsQuery\Select\EntryValues;
/**
* Interface QueriesEntries
*
* Interface that all classes that query for entries MUST impliment
*/
interface QueriesEntries interface QueriesEntries
{ {
/** /**
......
...@@ -3,11 +3,16 @@ ...@@ -3,11 +3,16 @@
namespace calderawp\CalderaFormsQuery; namespace calderawp\CalderaFormsQuery;
use calderawp\CalderaFormsQuery\Select\DoesSelectQuery; use calderawp\CalderaFormsQuery\Select\DoesSelectQuery;
use NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery; use NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery;
abstract class QueryBuilder implements DoesQueries /**
* Class QueryBuilder
*
*
* Used to create SQL queries, NOT run SQL queries
*/
abstract class QueryBuilder implements CreatesSqlQueries
{ {
const ASC = 'ASC'; const ASC = 'ASC';
const DESC = 'DESC'; const DESC = 'DESC';
...@@ -101,7 +106,8 @@ abstract class QueryBuilder implements DoesQueries ...@@ -101,7 +106,8 @@ abstract class QueryBuilder implements DoesQueries
*/ */
protected function getSecondDeliminator() protected function getSecondDeliminator()
{ {
return $this->isLike ? "%'" : "'"; } return $this->isLike ? "%'" : "'";
}
/** /**
* Surround one value with quotes or % * Surround one value with quotes or %
......
...@@ -29,7 +29,7 @@ class EntryValues extends SelectQueryBuilder ...@@ -29,7 +29,7 @@ class EntryValues extends SelectQueryBuilder
* @param string $fieldSlug Field slug * @param string $fieldSlug Field slug
* @param string $fieldValue Field value * @param string $fieldValue Field value
* @param string $type Optional. Type of comparison. Values: equals|notEquals|like Default: 'equals' * @param string $type Optional. Type of comparison. Values: equals|notEquals|like Default: 'equals'
* @param string $whereOperator Optional. Type of where. Default is 'AND'. Any valid MySQL where operator is accepted * @param string $whereOperator Optional. Type of where. Default is 'AND'. Any valid WHERE operator is accepted
* @return $this * @return $this
*/ */
public function queryByFieldValue($fieldSlug, $fieldValue, $type = 'equals', $whereOperator = 'AND') public function queryByFieldValue($fieldSlug, $fieldValue, $type = 'equals', $whereOperator = 'AND')
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
namespace calderawp\CalderaFormsQuery\Select; namespace calderawp\CalderaFormsQuery\Select;
use calderawp\CalderaFormsQuery\DoesQueries; use calderawp\CalderaFormsQuery\CreatesSqlQueries;
use calderawp\CalderaFormsQuery\MySqlBuilder; use calderawp\CalderaFormsQuery\MySqlBuilder;
use calderawp\CalderaFormsQuery\QueryBuilder; use calderawp\CalderaFormsQuery\QueryBuilder;
use NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery; use NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery;
...@@ -47,8 +47,4 @@ abstract class SelectQueryBuilder extends QueryBuilder implements DoesSelectQue ...@@ -47,8 +47,4 @@ abstract class SelectQueryBuilder extends QueryBuilder implements DoesSelectQue
$this->getCurrentQuery()->orderBy($column, $order); $this->getCurrentQuery()->orderBy($column, $order);
return $this; return $this;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment