More postgre porting

Author: phpfui

README.md

@@ -1,15 +1,12 @@
 # PHPFUI\ORM [![Tests](https://github.com/phpfui/ORM/actions/workflows/tests.yml/badge.svg)](https://github.com/phpfui/ORM/actions?query=workflow%3Atests) [![Latest Packagist release](https://img.shields.io/packagist/v/phpfui/ORM.svg)](https://packagist.org/packages/phpfui/ORM) ![](https://img.shields.io/badge/PHPStan-level%206-brightgreen.svg?style=flat)
 
 ### PHPFUI\ORM a minimal Object Relational Mapper (ORM) for MySQL, MariaDB, PostGre and SQLite3
-Why another PHP ORM? In writing minimal and fast websites, it was determined that existing PHP ORM solutions were overly complex. **PHPFUI\ORM** is a little more than 6.7K lines of code in 50 files.  It is designed to have a minimal memory footprint and excellent execution times for most database needs.
+Why another PHP ORM? In writing minimal and fast websites, it was determined that existing PHP ORM solutions were overly complex. **PHPFUI\ORM** is a little more than 7K lines of code in 52 files.  It is designed to have a minimal memory footprint and excellent execution times for most database needs.
 
 **PHPFUI\ORM** demonstrates superior performance for both speed and memory usage verses other ORMs. This is proven by a [comparison of PHPFUI\ORM to Other ORMs](https://github.com/phpfui/php-orm-sql-benchmarks) for different SQL implementations.
 
 **PHPFUI\ORM** is not an attempt to write an abstraction around SQL as other ORMs do, rather it is a way to work with SQL that closely matches the semantics of SQL, with the power of PHP objects.  It allows PHP to manipulate SQL queries without having to write SQL in plain text. This is very useful for queries generated via user interfaces where the user is given a lot of flexability in how a query is defined.
 
-### Version 2.0 requires updated Definition classes
-You will need to run the \PHPFUI\ORM\Tool\Generate\CRUD class against your database. See scripts/generateCRUD.php for an example.
-
 ## Features
 - **Active Records** A fully type checked object interface and implement basic CRUD functionality.
 - **Active Tables** Full table operations (select, update, insert and delete) including support for where, having, limits, ordering, grouping, joins and unions.

Tests/Fixtures/MigrationWrapper.php

@@ -43,11 +43,6 @@ public function alterColumnTest(string $table, string $field, string $parameters
 		return $this->alterColumn($table, $field, $parameters);
 		}
 
-	public function renameColumnTest(string $table, string $field, string $newName) : bool
-		{
-		return $this->renameColumn($table, $field, $newName);
-		}
-
 	/**
 	 * @param array<string> $keys
 	 */
@@ -110,6 +105,11 @@ public function indexExistsTest(string $table, string $indexName) : bool
 		return $this->indexExists($table, $indexName);
 		}
 
+	public function renameColumnTest(string $table, string $field, string $newName) : bool
+		{
+		return $this->renameColumn($table, $field, $newName);
+		}
+
 	public function renameTableTest(string $oldName, string $newName) : bool
 		{
 		return $this->renameTable($oldName, $newName);

Tests/Unit/DeleteTest.php

@@ -33,7 +33,8 @@ public function testRecordDelete() : void
 		$this->assertEquals(55, $table->count());
 		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$purchaseorderdetail = new \Tests\App\Record\PurchaseOrderDetail(245);
-		$this->assertEquals('2006-01-22 00:00:00', $purchaseorderdetail->date_received);
+		$time = \PHPFUI\ORM::getInstance()->postGre ? '2006-01-22 00:00:00+00' : '2006-01-22 00:00:00';
+		$this->assertEquals($time, $purchaseorderdetail->date_received);
 		$purchaseorderdetail->delete();
 		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals(54, $table->count());

Tests/Unit/InsertTest.php

@@ -11,6 +11,8 @@ public function testDateNullInsert() : void
 		$test->dateRequired = $date = \gmdate('Y-m-d');
 		$timeStamp = \gmdate('Y-m-d H:i:s');
 		$id = $test->insert();
+		$this->assertNotEquals(0, $id, 'id is zero');
+
 		$insertedTest = new \Tests\App\Record\DateRecord($id);
 
 		$this->assertNull($insertedTest->dateDefaultNull, 'dateDefaultNull is not null');
@@ -27,13 +29,11 @@ public function testDateRequiredInsert() : void
 		{
 		$test = new \Tests\App\Record\DateRecord();
 		$id = $test->insert();
-		$this->assertNotEmpty(\PHPFUI\ORM::getLastError());
 		$this->assertEquals(0, $id, '$id is not zero');
 		$insertedTest = new \Tests\App\Record\DateRecord($id);
 		$this->assertNull($insertedTest->dateDefaultNull, 'dateDefaultNull is not after insert');
 		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNullable, 'dateDefaultNullable has bad default value');
 		$this->assertEquals('2000-01-02', $insertedTest->dateDefaultNotNull, 'dateDefaultNotNull has bad default value');
-
 		}
 
 	public function testInsertOrIgnore() : void
@@ -59,19 +59,23 @@ public function testInsertOrIgnore() : void
 		$customer->web_page = 'http://www.phpfui.com';
 		$customer->zip_postal_code = '12345';
 		$id = $customer->insertOrIgnore();
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertGreaterThan(0, $id);
 		$this->assertEquals(30, $customerTable->count());
+		$this->assertTrue($transaction->commit());
 
 		$newCustomer = new \Tests\App\Record\Customer($id);
 		$this->assertEquals('12345', $newCustomer->zip_postal_code);
 		$newCustomer->zip_postal_code = '54321';
 		$result = $newCustomer->insertOrIgnore();
 		$this->assertEquals(0, $result);
-		$this->assertEmpty(\PHPFUI\ORM::getLastError());
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 
 		$updatedCustomer = new \Tests\App\Record\Customer($id);
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals('12345', $updatedCustomer->zip_postal_code);
-		$this->assertTrue($transaction->rollBack());
+		$updatedCustomer->delete();
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals(29, $customerTable->count());
 		}
 
@@ -98,13 +102,17 @@ public function testInsertOrUpdate() : void
 		$customer->web_page = 'http://www.phpfui.com';
 		$customer->zip_postal_code = '12345';
 		$id = $customer->insertOrUpdate();
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertGreaterThan(0, $id);
 		$this->assertEquals(30, $customerTable->count());
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 
 		$newCustomer = new \Tests\App\Record\Customer($id);
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals('12345', $newCustomer->zip_postal_code);
 		$newCustomer->zip_postal_code = '54321';
 		$result = $newCustomer->insertOrUpdate();
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertGreaterThan(0, $result);
 		$this->assertEquals(30, $customerTable->count());
 
@@ -172,6 +180,7 @@ public function testMultipleInserts() : void
 		$this->assertCount(29, $customerTable);
 
 		$customerTable->insert($customers);
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertCount(32, $customerTable);
 		$customerTable->setWhere(new \PHPFUI\ORM\Condition('zip_postal_code', operator:new \PHPFUI\ORM\Operator\IsNull()));
 		$this->assertCount(2, $customerTable);
@@ -206,6 +215,8 @@ public function testRecordInsert() : void
 		$table = new \Tests\App\Table\Customer();
 		$this->assertEquals(29, $table->count());
 		$customer->insert();
+//		print_r(\PHPFUI\ORM::getLastSQL());
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals(30, $table->count());
 		$this->assertTrue($transaction->rollBack());
 		$this->assertEquals(29, $table->count());
@@ -239,13 +250,15 @@ public function testRelatedInsert() : void
 		$order = new \Tests\App\Record\Order();
 		$order->employee_id = 9;
 		$order->customer = $customer;
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals(30, $customerTable->count());
 		$date = \date('Y-m-d H:i:s');
 		$order->order_date = $date;
 		$shipper = new \Tests\App\Record\Shipper();
 		$shipper->read(['company' => 'Shipping Company B']);
 		$this->assertEquals(2, $shipper->shipper_id);
 		$order->shipper = $shipper;
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertEquals($shipper->shipper_id, $order->shipper_id);
 		$order->ship_name = $customer->company;
 		$order->ship_address = $customer->address;
@@ -276,7 +289,6 @@ public function testRequiredStringNotSetInsert() : void
 		{
 		$test = new \Tests\App\Record\StringRecord();
 		$id = $test->insert();
-		$this->assertNotEmpty(\PHPFUI\ORM::getLastError());
 		$this->assertEquals(0, $id);
 		}
 
@@ -286,6 +298,7 @@ public function testStringNullInsert() : void
 		$test = new \Tests\App\Record\StringRecord();
 		$test->stringRequired = $required = 'required';
 		$id = $test->insert();
+		$this->assertEquals('', \PHPFUI\ORM::getLastError());
 		$this->assertGreaterThan(0, $id);
 		$insertedTest = new \Tests\App\Record\StringRecord($id);
 		$this->assertNull($insertedTest->stringDefaultNull);