Merge branch 'master' of github.com:mevdschee/php-crud-api

mevdschee · mevdschee · commit b0132a387d19 · 2020-04-02T22:28:23.000+02:00
diff --git a/README.md b/README.md
@@ -1090,10 +1090,11 @@ NB: Any non-error response will have status: 200 OK
 
 I am testing mainly on Ubuntu and I have the following test setups:
 
-  - (Docker) Debian 10 with PHP 7.3, MariaDB 10.3, PostgreSQL 11.4 (PostGIS 2.5)
-  - (Docker) Debian 9 with PHP 7.0, MariaDB 10.1, PostgreSQL 9.6 (PostGIS 2.3)
   - (Docker) Ubuntu 16.04 with PHP 7.0, MariaDB 10.0, PostgreSQL 9.5 (PostGIS 2.2) and SQL Server 2017
+  - (Docker) Debian 9 with PHP 7.0, MariaDB 10.1, PostgreSQL 9.6 (PostGIS 2.3)
   - (Docker) Ubuntu 18.04 with PHP 7.2, MySQL 5.7, PostgreSQL 10.4 (PostGIS 2.4)
+  - (Docker) Debian 10 with PHP 7.3, MariaDB 10.3, PostgreSQL 11.4 (PostGIS 2.5)
+  - (Docker) Ubuntu 20.04 with PHP 7.3, MySQL 8.0, PostgreSQL 12 (PostGIS 3)
 
 This covers not all environments (yet), so please notify me of failing tests and report your environment. 
 I will try to cover most relevant setups in the "docker" folder of the project.
diff --git a/examples/clients/datatables.html b/examples/clients/datatables.html
@@ -0,0 +1,45 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.20/css/jquery.dataTables.min.css"/>
+<script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>
+<script>
+$(document).ready(function() {
+    $('#example').DataTable( {
+        ajax: {
+            url: '/api.php/records/posts?join=categories&join=users',
+            dataSrc: 'records'
+        },
+        columns: [
+            { data: "id" },
+            { data: "user_id.username" },
+            { data: "category_id.name" },
+            { data: "content" }
+        ]
+    });
+});
+</script>
+</head>
+<body>
+
+<table id="example" class="display" style="width:100%">
+    <thead>
+        <tr>
+            <th>ID</th>
+            <th>Username</th>
+            <th>Category</th>
+            <th>Content</th>
+        </tr>
+    </thead>
+    <tfoot>
+        <tr>
+            <th>ID</th>
+            <th>Username</th>
+            <th>Category</th>
+            <th>Content</th>
+        </tr>
+    </tfoot>
+</table>
+
+</body>
+</html>
