Development

- Removed depricated prefix method. - Made table parameter in alias method optional. - Removed .idea folder as it was causing issues.
skipperbent · Dec 2, 2017 · 26c4611 · 26c4611
1 parent 1676767
commit 26c4611
Show file tree

Hide file tree

Showing 17 changed files with 124 additions and 408 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ composer.phar
 *~
 /devel/
 /coverage.clover
+.idea/
 
 ### Composer template
 /vendor/

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/composerJson.xml b/.idea/composerJson.xml
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/pecee-pixie.iml b/.idea/pecee-pixie.iml
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
@@ -303,6 +303,21 @@ $result = $queryBuilder
 
 ### Select
 
+#### Select from query
+
+You can easily select items from another query by using
+
+```php
+$subQuery = $queryBuilder->table('person');
+$builder = $queryBuilder->table($queryBuilder->subQuery($subQuery))->where('id', '=', 2);
+```
+
+Will produce the following output:
+
+```sql
+SELECT * FROM (SELECT * FROM `person`) WHERE `id` = 2
+```
+
 #### Select single field
 
 ```php

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     "usmanhalalit/viocon": "1.0.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.4",
+    "phpunit/phpunit": "^6.0",
     "mockery/mockery": "^1"
   },
   "autoload": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ composer.phar @@
     *~
     /devel/
     /coverage.clover
+    .idea/
     ### Composer template
     /vendor/
@@ Expand Down @@