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

make in() public

parent c7f960ef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 30
− 58
View file @ 34359f35
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8debb13c-dec3-4d96-b552-5550bc63772b" name="Default" comment=""> <list default="true" id="8debb13c-dec3-4d96-b552-5550bc63772b" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/Tests/plugins/caldera-forms" beforeDir="false" afterPath="$PROJECT_DIR$/Tests/plugins/caldera-forms" 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" /> <change beforePath="$PROJECT_DIR$/src/QueryBuilder.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/QueryBuilder.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -17,41 +16,14 @@ ...@@ -17,41 +16,14 @@
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.56924814"> <splitter split-orientation="horizontal" split-proportion="0.5282903">
<split-first> <split-first>
<leaf> <leaf>
<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="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="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="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="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="QueryBuilder.php" pinned="false" current-in-tab="true"> <file leaf-file-name="QueryBuilder.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/QueryBuilder.php"> <entry file="file://$PROJECT_DIR$/src/QueryBuilder.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="340">
<caret line="150" column="11" selection-start-line="150" selection-start-column="11" selection-end-line="150" selection-end-column="11" /> <caret line="170" column="11" selection-start-line="170" selection-start-column="11" selection-end-line="170" selection-end-column="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -80,8 +52,8 @@ ...@@ -80,8 +52,8 @@
<file leaf-file-name="FeatureContainer.php" pinned="false" current-in-tab="true"> <file leaf-file-name="FeatureContainer.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php"> <entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1010"> <state relative-caret-position="177">
<caret line="181" column="27" selection-start-line="181" selection-start-column="27" selection-end-line="181" selection-end-column="27" /> <caret line="308" column="21" selection-start-line="308" selection-start-column="21" selection-end-line="308" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -130,8 +102,8 @@ ...@@ -130,8 +102,8 @@
<option value="$PROJECT_DIR$/Tests/Unit/Select/EntryTest.php" /> <option value="$PROJECT_DIR$/Tests/Unit/Select/EntryTest.php" />
<option value="$PROJECT_DIR$/src/Features/Queries.php" /> <option value="$PROJECT_DIR$/src/Features/Queries.php" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/src/QueryBuilder.php" />
<option value="$PROJECT_DIR$/src/Features/FeatureContainer.php" /> <option value="$PROJECT_DIR$/src/Features/FeatureContainer.php" />
<option value="$PROJECT_DIR$/src/QueryBuilder.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -283,7 +255,7 @@ ...@@ -283,7 +255,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="12193000" /> <option name="totallyTimeSpent" value="13885000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="1057" extended-state="0" /> <frame x="0" y="23" width="1920" height="1057" extended-state="0" />
...@@ -294,7 +266,7 @@ ...@@ -294,7 +266,7 @@
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> <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="Run" order="2" weight="0.3297619" />
<window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.39583334" /> <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.39583334" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1341853" /> <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 anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="Grunt " order="2" side_tool="true" /> <window_info id="Grunt " order="2" side_tool="true" />
...@@ -485,13 +457,6 @@ ...@@ -485,13 +457,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Features/DoesQueries.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/DeleteQueries.php"> <entry file="file://$PROJECT_DIR$/src/DeleteQueries.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="599"> <state relative-caret-position="599">
...@@ -629,24 +594,24 @@ ...@@ -629,24 +594,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Select/Entry.php"> <entry file="file://$PROJECT_DIR$/src/Features/DoesQueries.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="75">
<caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" /> <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Select/EntryValues.php"> <entry file="file://$PROJECT_DIR$/src/Select/Entry.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="300">
<caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" /> <caret line="42" column="20" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Select/ValueSelectQueryBuilder.php"> <entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="177">
<caret line="5" column="51" lean-forward="true" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" /> <caret line="308" column="21" selection-start-line="308" selection-start-column="21" selection-end-line="308" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -657,17 +622,24 @@ ...@@ -657,17 +622,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/QueryBuilder.php"> <entry file="file://$PROJECT_DIR$/src/Select/ValueSelectQueryBuilder.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="75">
<caret line="150" column="11" selection-start-line="150" selection-start-column="11" selection-end-line="150" selection-end-column="11" /> <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Features/FeatureContainer.php"> <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="41" lean-forward="true" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/QueryBuilder.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1010"> <state relative-caret-position="340">
<caret line="181" column="27" selection-start-line="181" selection-start-column="27" selection-end-line="181" selection-end-column="27" /> <caret line="170" column="11" selection-start-line="170" selection-start-column="11" selection-end-line="170" selection-end-column="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
src/QueryBuilder.php
+ 12
− 10
View file @ 34359f35
...@@ -98,15 +98,17 @@ abstract class QueryBuilder implements CreatesSqlQueries ...@@ -98,15 +98,17 @@ abstract class QueryBuilder implements CreatesSqlQueries
*/ */
protected function substituteValues($sql) protected function substituteValues($sql)
{ {
$values = $this->getBuilder()->getValues(); $values = $this->getBuilder()->getValues();
foreach ($values as $identifier => $value) { foreach ($values as $identifier => $value) {
if (is_array($value) || is_object($value)) { if (is_array($value) || is_object($value)) {
continue; continue;
} else { }elseif (is_numeric( $value)){
$values[$identifier] = $this->surroundValue($value); $value[$identifier] = (int) $value;
} } else {
} $values[$identifier] = $this->surroundValue($value);
return str_replace(array_keys($values), array_values($values), $sql); }
}
return str_replace(array_keys($values), array_values($values), $sql);
} }
/** /**
...@@ -166,7 +168,7 @@ abstract class QueryBuilder implements CreatesSqlQueries ...@@ -166,7 +168,7 @@ abstract class QueryBuilder implements CreatesSqlQueries
* @param string $column Column name. Default is 'id'. * @param string $column Column name. Default is 'id'.
* @return $this * @return $this
*/ */
protected function in(array $entryIds, $column = 'id') public function in(array $entryIds, $column = 'id')
{ {
$this $this
->getCurrentQuery() ->getCurrentQuery()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment