Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow other schema than "public" on PostgreSQL databases #217

Merged

Conversation

richard67
Copy link
Contributor

Pull Request for Issue #157 (part 2)

Summary of Changes

Port back joomla/joomla-cms#24999 and joomla/joomla-cms#30570 to the framework.

Testing Instructions

See testing instructions of joomla/joomla-cms#24999 and joomla/joomla-cms#30570 .

Documentation Changes Required

No idea.

@richard67
Copy link
Contributor Author

@wilsonge Does @since __DEPLOY_VERSION__ work here, too?

@wilsonge
Copy link
Contributor

Yes :)

@richard67
Copy link
Contributor Author

@wilsonge Do you know who currently maintains this repo? And does it need an extra PR for 2.0-dev, or will this one be merged up after it has been merged into master?

@nibra
Copy link
Contributor

nibra commented Nov 26, 2020

@richard67 Llewellyn and I have taken over the responsibility for the framework. There's still a lot we have figure out, so please bear with us ;)

If the merge wents through, we'll merge it; otherwise, we'll get back to you.

Nevertheless, there are failing tests, which need to be fixed, before this PR can be merged::

There was 1 error:
1) Joomla\Database\Tests\DriverPostgresqlTest::testInsertObject
pg_prepare(): Query failed: ERROR:  syntax error at or near ")"
LINE 2: () VALUES 
         ^
C:\projects\database\src\Postgresql\PostgresqlDriver.php:961
C:\projects\database\src\Postgresql\PostgresqlDriver.php:1276
C:\projects\database\Tests\DriverPostgresqlTest.php:595
--
There was 1 failure:
1) Joomla\Database\Tests\DriverPostgresqlTest::testGetTableColumns
315
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
-    'id' => 'integer'
-    'title' => 'character varying'
-    'start_date' => 'timestamp without time zone'
-    'description' => 'text'
-    'data' => 'bytea'
 )
C:\projects\database\Tests\DriverPostgresqlTest.php:315

@richard67
Copy link
Contributor Author

@nibra If you check some other PR for the master branch you will see the same test failing. So it's not related to this PR. I've tried to find the reason, but I wasn't successful.

@nibra
Copy link
Contributor

nibra commented Nov 26, 2020

@wilsonge Can you confirm?

@wilsonge
Copy link
Contributor

I'd wait for Harald to build joomla/joomla-cms#30570 before merging. But this is fine as a backport of that work otherwise.

@richard67 it will be merged up to 2.0-dev when this is merged

@wilsonge
Copy link
Contributor

@richard67 looks like #218 pr to master is passing - so think the tests failing are probably coming from these changes :/

@richard67
Copy link
Contributor Author

@wilsonge Others have travis-ci and not appveyour. Why that?

@richard67
Copy link
Contributor Author

@wilsonge Found my mistake, had forgotten a part.

@richard67
Copy link
Contributor Author

@nibra Found my mistake, should be fixed now.

@nibra
Copy link
Contributor

nibra commented Nov 26, 2020

@richard67 Looks much better! Let's wait for Harald to merge joomla/joomla-cms#30570, as @wilsonge suggested, and then merge this.

@richard67
Copy link
Contributor Author

richard67 commented Dec 2, 2020

@wilsonge Do you think that these typos which I've corrected in my last commit are worth to be corrected in the CMS repo in staging, too?

Have changed that in the open CMS PR.

@richard67
Copy link
Contributor Author

Now as joomla/joomla-cms#30570 has been merged in the CMS repo, this one here can be merged too, and then merged up from master into 2.-dev.

@nibra nibra merged commit 90cab6c into joomla-framework:master Dec 14, 2020
@richard67 richard67 deleted the master-add-postgresql-default-scheme branch December 15, 2020 13:48
@richard67
Copy link
Contributor Author

Now it needs to be merged up into 2.0-dev here, so someone (I?) can make a PR for the 4.0-dev branch of the CMS to update the database package.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants