diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/PostgreSQL.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/PostgreSQL.enso index bd3e2568256e9..05301077b3904 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/PostgreSQL.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/PostgreSQL.enso @@ -75,6 +75,7 @@ type PostgreSQL - port: The port of the database server. - database: The database to connect to. read_pgpass : Text -> Integer -> Text -> [Pair Text Text] - read_pgpass host='' port=5433 database='' = + read_pgpass _ _ _ = ## ToDo: Code not part of the design document. + ## host port database [] diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso index 8eee423c726b2..45894dc398d4a 100644 --- a/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso +++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Data/Dialect.enso @@ -52,7 +52,7 @@ type Dialect A vector of SQL dialects supported by the Database library. supported_dialects : Vector Dialect -supported_dialects = [Postgres_Module.postgresql, Sqlite_Module.sqlite, Redshift.redshift] +supported_dialects = [Postgres_Module.postgresql, Sqlite_Module.sqlite, Redshift_Module.redshift] ## PRIVATE @@ -70,6 +70,6 @@ postgres = Postgres_Module.postgresql The dialect of Redshift databases. redshift : Dialect -redshit = Redshift_Module.redshift +redshift = Redshift_Module.redshift diff --git a/test/Table_Tests/src/Database/Sqlite_Spec.enso b/test/Table_Tests/src/Database/Sqlite_Spec.enso index 998badd2eebc1..ab9b5f6a365bc 100644 --- a/test/Table_Tests/src/Database/Sqlite_Spec.enso +++ b/test/Table_Tests/src/Database/Sqlite_Spec.enso @@ -43,13 +43,7 @@ sqlite_specific_spec connection = t.at "reals" . sql_type . is_definitely_boolean . should_be_false t.at "bools" . sql_type . is_definitely_double . should_be_false -spec = - Enso_Project.data.create_directory - file = Enso_Project.data / "sqlite_test.db" - file.delete_if_exists - connection = Database.connect (SQLite file) - prefix = "[SQLite] " - +sqlite_spec connection prefix = name_counter = Ref.new 0 table_builder columns = ix = name_counter.get @@ -80,6 +74,14 @@ spec = Aggregate_Spec.aggregate_spec prefix agg_table empty_agg_table table_builder materialize is_database=True selection connection.close + +spec = + Enso_Project.data.create_directory + file = Enso_Project.data / "sqlite_test.db" + file.delete_if_exists + here.sqlite_spec (Database.connect (SQLite file)) "[SQLite] " file.delete + here.sqlite_spec (Database.connect (SQLite InMemory)) "[SQLite Memory] " + main = Test.Suite.run_main here.spec