Update SQLAlchemy, fix tests

[richardscholtens]

• Fix all test_aggregate_graphs
• Fix all test_store_performance
• Fix all test_type_to_term_combination
• Update SQLAlchemy to version 2.0.23
• Refactor sqlalchemy statements

[mwatts15]

@richardscholtens: Sorry, I'm just getting back to this. Unfortunately Actions still turns up a test failure.

[richardscholtens]

I have been busy lately but I am still keen on finishing my contribution. However, I seem to be stuck at a certain test. The test now fail on for PostgreSQL for test SQLAPgSQLContextTestCase namely testTriples. Every assert passes except the last one:

        # all unbound without context, same result!
>       asserte(len(list(triples((Any, Any, Any)))), 7)

It states it cannot find the triples within the default context. Still trying to figure what is going wrong here.

[jfahne]

select_clause = expression.select(*all_table_columns).select_from(table)
if whereClause is not None:
    select_clause = select_clause.where(whereClause)

I had to hunt for a while but this is what is hit by that part of the test triples cases for all free variables in the query. I checked the compiled SQL by casting the select_clause to a string and I saw that because the whereClause is just None using SQLA's where() method yields a compiled WHERE NULL which blocks everything in the result set.

[amotl]

Hi there. I've submitted the fix @jfahne outlined above (thank you very much!) targeted to your branch, @richardscholtens. Maybe you can bring it in and refresh your patch over here?

• Fix update to SQLAlchemy 2 richardscholtens/rdflib-sqlalchemy#1

[richardscholtens]

@amotl, I believe I have added your two commits. However, I do not see any fix in your commits for the SQL problem. @jfahne did not provide a fix as far I can tell. He only states where the problem lies. Please correct me if I'm wrong. Maybe I missed something.

[richardscholtens]

I added a if else statement now and that seems to work for the PostgreSQL database for now:

        elif tableType == ASSERTED_NON_TYPE_PARTITION:
            all_table_columns = [c for c in table.columns] + [expression.literal_column("NULL").label("objlanguage"), expression.literal_column("NULL").label("objdatatype")]
            if whereClause is not None:
                select_clause = expression.select(*all_table_columns).select_from(table).where(whereClause)
            else:
                select_clause = expression.select(*all_table_columns).select_from(table)
        **selects.append(select_clause)**

[richardscholtens]

I did another commit for tox linting error @mwatts15

[mwatts15]

Well done, @richardscholtens! Good team work, @jfahne, @amotl.