Some improvements as per #436

Author: mevdschee

api.php

@@ -1739,8 +1739,9 @@ class GenericDB
     private $database;
     private $pdo;
     private $reflection;
-    private $columns;
+    private $definition;
     private $conditions;
+    private $columns;
     private $converter;
 
     private function getDsn(String $address, String $port = null, String $database = null): String
@@ -1916,9 +1917,6 @@ public function selectAll(ReflectedTable $table, array $columnNames, Condition $
         if ($limit == 0) {
             return array();
         }
-        if (!$columnOrdering) {
-            return $this->selectAllUnordered($table, $columnNames, $condition);
-        }
         $selectColumns = $this->columns->getSelect($table, $columnNames);
         $tableName = $table->getName();
         $condition = $this->addAuthorizationCondition($condition);
@@ -3222,7 +3220,7 @@ public function handle(Request $request): Response
 
 class DefaultOpenApiDefinition
 {
-    private $root = [
+    protected $root = [
         "openapi" => "3.0.0",
         "info" => [
             "title" => "JAVA-CRUD-API",
@@ -3281,7 +3279,7 @@ private function set(String $path, String $value) /*: void*/
     public function setPaths(DatabaseDefinition $database) /*: void*/
     {
         $result = [];
-        foreach ($database->getTables() as $database) {
+        foreach ($database->getTables() as $table) {
             $path = sprintf('/records/%s', $table->getName());
             foreach (['get', 'post', 'put', 'patch', 'delete'] as $method) {
                 $this->set("/paths/$path/$method/description", "$method operation");
@@ -3830,6 +3828,11 @@ public function getColumnOrdering(ReflectedTable $table, array $params): array
             $pk = $table->getPk();
             if ($pk) {
                 $fields[] = [$pk->getName(), 'ASC'];
+            } else {
+                foreach ($table->columnNames() as $columnName) {
+                    $fields[] = [$columnName, 'ASC'];
+                }
+
             }
         }
         return $fields;

src/Tqdev/PhpCrudApi/Database/GenericDB.php

@@ -13,8 +13,9 @@ class GenericDB
     private $database;
     private $pdo;
     private $reflection;
-    private $columns;
+    private $definition;
     private $conditions;
+    private $columns;
     private $converter;
 
     private function getDsn(String $address, String $port = null, String $database = null): String

src/Tqdev/PhpCrudApi/OpenApi/DefaultOpenApiDefinition.php

@@ -3,7 +3,7 @@
 
 class DefaultOpenApiDefinition
 {
-    private $root = [
+    protected $root = [
         "openapi" => "3.0.0",
         "info" => [
             "title" => "JAVA-CRUD-API",

src/Tqdev/PhpCrudApi/OpenApi/OpenApiDefinition.php

@@ -20,7 +20,7 @@ private function set(String $path, String $value) /*: void*/
     public function setPaths(DatabaseDefinition $database) /*: void*/
     {
         $result = [];
-        foreach ($database->getTables() as $database) {
+        foreach ($database->getTables() as $table) {
             $path = sprintf('/records/%s', $table->getName());
             foreach (['get', 'post', 'put', 'patch', 'delete'] as $method) {
                 $this->set("/paths/$path/$method/description", "$method operation");