diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ecdf6260022afc380b00b143fe0fb1e903af1126..3518652fc5a4a55d40cba6a5d868df9ac2909b1b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8debb13c-dec3-4d96-b552-5550bc63772b" name="Default" comment="">
- <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Tests/plugins/caldera-forms" beforeDir="false" afterPath="$PROJECT_DIR$/Tests/plugins/caldera-forms" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/Features/FeatureContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Features/FeatureContainer.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/QueryBuilder.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/QueryBuilder.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -16,42 +17,51 @@
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</component>
<component name="FileEditorManager">
- <splitter split-orientation="horizontal" split-proportion="0.5">
+ <splitter split-orientation="horizontal" split-proportion="0.56924814">
<split-first>
<leaf>
- <file leaf-file-name="SelectQueryBuilder.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/Select/SelectQueryBuilder.php">
+ <file leaf-file-name="EntryValues.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/Select/EntryValues.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="298">
- <caret line="50" column="14" selection-start-line="50" selection-start-column="14" selection-end-line="50" selection-end-column="14" />
+ <state relative-caret-position="150">
+ <caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="FeatureContainer.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php">
+ <file leaf-file-name="ValueSelectQueryBuilder.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/Select/ValueSelectQueryBuilder.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="227">
- <caret line="143" column="38" selection-start-line="143" selection-start-column="38" selection-end-line="143" selection-end-column="38" />
+ <state relative-caret-position="75">
+ <caret line="5" column="51" lean-forward="true" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="phpunit" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/vendor/phpunit/phpunit/phpunit">
- <provider selected="true" editor-type-id="text-editor" />
+ <file leaf-file-name="SelectQueryBuilder.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/Select/SelectQueryBuilder.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="420">
+ <caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
+ </state>
+ </provider>
</entry>
</file>
- <file leaf-file-name="TestCase.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/vendor/phpunit/phpunit/src/Framework/TestCase.php">
+ <file leaf-file-name="QueryBuilder.php" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/QueryBuilder.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="159">
- <caret line="797" selection-start-line="797" selection-end-line="797" />
+ <state relative-caret-position="418">
+ <caret line="150" column="11" selection-start-line="150" selection-start-column="11" selection-end-line="150" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+ <file leaf-file-name="DeleteQueryBuilder.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/Delete/DeleteQueryBuilder.php">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ </file>
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="FIRST">
@@ -63,29 +73,20 @@
</provider>
</entry>
</file>
- <file leaf-file-name="Select.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/vendor/nilportugues/sql-query-builder/src/Manipulation/Select.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="538">
- <caret line="390" column="25" selection-start-line="390" selection-start-column="15" selection-end-line="390" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</split-first>
<split-second>
<leaf>
- <file leaf-file-name="FeatureContainer.php" pinned="false" current-in-tab="false">
+ <file leaf-file-name="FeatureContainer.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="354">
- <caret line="204" selection-start-line="204" selection-end-line="204" />
+ <state relative-caret-position="1010">
+ <caret line="181" column="27" selection-start-line="181" selection-start-column="27" selection-end-line="181" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="composer.json" pinned="false" current-in-tab="true">
+ <file leaf-file-name="composer.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
@@ -128,8 +129,9 @@
<option value="$PROJECT_DIR$/src/Select/SelectQueryBuilder.php" />
<option value="$PROJECT_DIR$/Tests/Unit/Select/EntryTest.php" />
<option value="$PROJECT_DIR$/src/Features/Queries.php" />
- <option value="$PROJECT_DIR$/src/Features/FeatureContainer.php" />
<option value="$PROJECT_DIR$/README.md" />
+ <option value="$PROJECT_DIR$/src/QueryBuilder.php" />
+ <option value="$PROJECT_DIR$/src/Features/FeatureContainer.php" />
</list>
</option>
</component>
@@ -216,12 +218,24 @@
<item name="caldera-forms-query" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="caldera-forms-query" type="b2602c69:ProjectViewProjectNode" />
+ <item name="caldera-forms-query" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="Delete" type="462c0819:PsiDirectoryNode" />
+ </path>
<path>
<item name="caldera-forms-query" type="b2602c69:ProjectViewProjectNode" />
<item name="caldera-forms-query" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="Features" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="caldera-forms-query" type="b2602c69:ProjectViewProjectNode" />
+ <item name="caldera-forms-query" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="Select" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
@@ -269,7 +283,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="10580000" />
+ <option name="totallyTimeSpent" value="12193000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="1057" extended-state="0" />
@@ -280,8 +294,8 @@
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3297619" />
<window_info anchor="bottom" id="Version Control" order="7" />
- <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.39583334" />
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14376996" />
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.39583334" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1341853" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="Grunt " order="2" side_tool="true" />
<window_info anchor="right" id="Database" order="3" />
@@ -317,20 +331,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/vendor/nilportugues/sql-query-builder/src/Builder/GenericBuilder.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="722">
- <caret line="72" column="37" selection-start-line="72" selection-start-column="37" selection-end-line="72" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/Select/SelectQueryBuilder.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="313">
- <caret line="51" column="14" selection-start-line="51" selection-start-column="14" selection-end-line="51" selection-end-column="14" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/Features/Queries.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
@@ -492,34 +492,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/Select/DoesSelectQuery.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/Select/DoesSelectQueryByValue.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/Select/ValueSelectQueryBuilder.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="30" column="24" selection-end-line="47" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/Select/EntryValues.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/DeleteQueries.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="599">
@@ -537,13 +509,6 @@
<state relative-caret-position="-941" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/Select/Entry.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/CreatesSelectQueries.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
@@ -599,13 +564,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/QueryBuilder.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="457">
- <caret line="158" column="64" selection-start-line="158" selection-start-column="64" selection-end-line="158" selection-end-column="64" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/vendor/nilportugues/sql-query-builder/src/Builder/GenericBuilder.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
@@ -613,20 +571,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/Select/SelectQueryBuilder.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="298">
- <caret line="50" column="14" selection-start-line="50" selection-start-column="14" selection-end-line="50" selection-end-column="14" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/Features/Queries.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="480">
- <caret line="76" column="33" selection-start-line="76" selection-start-column="33" selection-end-line="76" selection-end-column="33" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/vendor/phpunit/phpunit/phpunit">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -637,13 +581,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="227">
- <caret line="143" column="38" selection-start-line="143" selection-start-column="38" selection-end-line="143" selection-end-column="38" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
@@ -661,5 +598,78 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/Select/DoesSelectQueryByValue.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="450">
+ <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Delete/DeleteQueryBuilder.php">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Delete/EntryValues.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="103">
+ <caret line="10" column="6" lean-forward="true" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Features/Queries.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1151">
+ <caret line="88" column="20" selection-start-line="88" selection-start-column="20" selection-end-line="88" selection-end-column="20" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Select/DoesSelectQuery.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="210">
+ <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Select/Entry.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Select/EntryValues.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Select/ValueSelectQueryBuilder.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="51" lean-forward="true" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Select/SelectQueryBuilder.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="420">
+ <caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/QueryBuilder.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="418">
+ <caret line="150" column="11" selection-start-line="150" selection-start-column="11" selection-end-line="150" selection-end-column="11" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1010">
+ <caret line="181" column="27" selection-start-line="181" selection-start-column="27" selection-end-line="181" selection-end-column="27" />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/Features/FeatureContainer.php b/src/Features/FeatureContainer.php
index a53919278c021491d09ea7aadb20922c3b4c7254..e2f24895afda5c286eaaa82b837c8d364257dfef 100644
--- a/src/Features/FeatureContainer.php
+++ b/src/Features/FeatureContainer.php
@@ -132,6 +132,7 @@ class FeatureContainer extends Container
return $this->collectResults($this->select($query));
}
+
/**
* Find all entries that have or do not have field with a slug and value
*
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
index 1a731cfad41a45ded8d61c6447b8c365c325f9f2..708775f109893348b139bae5fc59c65b2f421b44 100644
--- a/src/QueryBuilder.php
+++ b/src/QueryBuilder.php
@@ -148,7 +148,7 @@ abstract class QueryBuilder implements CreatesSqlQueries
* @param string $value
* @return $this
*/
- protected function is($column, $value)
+ public function is($column, $value)
{
return $this->addWhereEquals($this->getCurrentQuery(), $column, $value);
}