Changeset: 6c0ae4c3096c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6c0ae4c3096c
Added Files:
sql/test/proto_loader/odbc/Tests/sqlite3odbc.test.in
Removed Files:
sql/test/proto_loader/odbc/Tests/sqlite3odbc.test
sql/test/proto_loader/odbc/Tests/sqlite3odbc_local.test.in
Modified Files:
sql/test/proto_loader/odbc/Tests/All
testing/Mtest.py.in
Branch: Mar2025
Log Message:
Check whether sqlite odbc driver is installed and test with it if it is.
diffs (truncated from 635 to 300 lines):
diff --git a/sql/test/proto_loader/odbc/Tests/All
b/sql/test/proto_loader/odbc/Tests/All
--- a/sql/test/proto_loader/odbc/Tests/All
+++ b/sql/test/proto_loader/odbc/Tests/All
@@ -1,5 +1,4 @@
incomplete_uri
NOT_WIN32?monetodbc
!NOT_WIN32?monetodbc-Windows
-# NOT_WIN32?sqlite3odbc # test requires SQLite ODBC driver to be
installed on test servers (/usr/lib64/libsqlite3odbc.so)
-NOT_WIN32&HAVE_DATA_PATH?sqlite3odbc_local
+HAVE_SQLITE3ODBC&HAVE_DATA_PATH?sqlite3odbc
diff --git a/sql/test/proto_loader/odbc/Tests/sqlite3odbc.test
b/sql/test/proto_loader/odbc/Tests/sqlite3odbc.test.in
rename from sql/test/proto_loader/odbc/Tests/sqlite3odbc.test
rename to sql/test/proto_loader/odbc/Tests/sqlite3odbc.test.in
--- a/sql/test/proto_loader/odbc/Tests/sqlite3odbc.test
+++ b/sql/test/proto_loader/odbc/Tests/sqlite3odbc.test.in
@@ -18,7 +18,7 @@ select * from proto_loader('odbc:DRIVER=
----
query TTTT
-select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=/home/dinther/Downloads/sqlite_dbs/chinook.db;QUERY=SELECT
tbl_name, type, name, sql FROM sqlite_schema ORDER BY 1,2 DESC,3')
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
tbl_name, type, name, sql FROM sqlite_schema ORDER BY 1,2 DESC,3')
----
albums
table
@@ -118,7 +118,7 @@ IFK_TrackMediaTypeId
CREATE INDEX [IFK_TrackMediaTypeId] ON "tracks" ([MediaTypeId])
query IITTTTTTI
-select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=/home/dinther/Downloads/sqlite_dbs/chinook.db;QUERY=SELECT
* FROM invoices limit 11')
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM invoices limit 11')
----
1
2
@@ -221,7 +221,7 @@ N1 5LH
8
query TI
-select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=/home/dinther/Downloads/sqlite_dbs/chinook.db;QUERY=SELECT
* FROM sqlite_sequence')
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM sqlite_sequence')
----
genres
25
@@ -244,3 +244,195 @@ 2240
playlists
18
+query TTT nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM sqlite_stat1')
+----
+tracks
+IFK_TrackMediaTypeId
+3503 701
+tracks
+IFK_TrackGenreId
+3503 141
+tracks
+IFK_TrackAlbumId
+3503 11
+playlist_track
+IFK_PlaylistTrackTrackId
+8715 3
+playlist_track
+sqlite_autoindex_playlist_track_1
+8715 623 1
+albums
+IFK_AlbumArtistId
+347 2
+artists
+NULL
+275
+customers
+IFK_CustomerSupportRepId
+59 20
+playlists
+NULL
+18
+employees
+IFK_EmployeeReportsTo
+8 2
+genres
+NULL
+25
+invoices
+IFK_InvoiceCustomerId
+412 7
+media_types
+NULL
+5
+invoice_items
+IFK_InvoiceLineTrackId
+2240 2
+invoice_items
+IFK_InvoiceLineInvoiceId
+2240 6
+
+query ITI nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM albums')
+----
+1041 values hashing to 5629d90611e126ef86cf716bffff1fe9
+
+query IT nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM artists')
+----
+550 values hashing to f6d93e6eefe9276280048f02224c4b2f
+
+query ITTTTTTTTTTTI nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM customers')
+----
+767 values hashing to ac1c25f0abde32d6a592ad4c74375e6c
+
+query IT nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM genres')
+----
+1
+Rock
+2
+Jazz
+3
+Metal
+4
+Alternative & Punk
+5
+Rock And Roll
+6
+Blues
+7
+Latin
+8
+Reggae
+9
+Pop
+10
+Soundtrack
+11
+Bossa Nova
+12
+Easy Listening
+13
+Heavy Metal
+14
+R&B/Soul
+15
+Electronica/Dance
+16
+World
+17
+Hip Hop/Rap
+18
+Science Fiction
+19
+TV Shows
+20
+Sci Fi & Fantasy
+21
+Drama
+22
+Comedy
+23
+Alternative
+24
+Classical
+25
+Opera
+
+query IIIRI nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM invoice_items')
+----
+11200 values hashing to a9e3a705e7d0f104f12537d7a4452fc8
+
+query IITTTTTTR nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM invoices')
+----
+3708 values hashing to 6468e5558d61ab41f736750792ceb3a0
+
+query IT nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM media_types')
+----
+1
+MPEG audio file
+2
+Protected AAC audio file
+3
+Protected MPEG-4 video file
+4
+Purchased AAC audio file
+5
+AAC audio file
+
+query II nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM playlist_track')
+----
+17430 values hashing to b3662845bff3c7fd8568b8b25033d188
+
+query IT nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM playlists')
+----
+1
+Music
+2
+Movies
+3
+TV Shows
+4
+Audiobooks
+5
+90’s Music
+6
+Audiobooks
+7
+Movies
+8
+Music
+9
+Music Videos
+10
+TV Shows
+11
+Brazilian Music
+12
+Classical
+13
+Classical 101 - Deep Cuts
+14
+Classical 101 - Next Steps
+15
+Classical 101 - The Basics
+16
+Grunge
+17
+Heavy Metal Classic
+18
+On-The-Go 1
+
+query ITIIITIIR nosort
+select * from
proto_loader('odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
* FROM tracks')
+----
+31527 values hashing to 9bdd4fdb9d8b354b75169ce5bddbda76
+
diff --git a/sql/test/proto_loader/odbc/Tests/sqlite3odbc_local.test.in
b/sql/test/proto_loader/odbc/Tests/sqlite3odbc_local.test.in
deleted file mode 100644
--- a/sql/test/proto_loader/odbc/Tests/sqlite3odbc_local.test.in
+++ /dev/null
@@ -1,336 +0,0 @@
--- test with 'odbc:DRIVER=/usr/lib64/libsqlite3odbc.so;' protocol specification
--- test with
'odbc:DRIVER=/home/dinther/dev/dev/MonetDB/sql/test/proto_loader/odbc/Tests/libsqlite3odbc-0.99991.so;Database=/home/dinther/dev/dev/MonetDB/sql/test/proto_loader/odbc/Tests/chinook.db;QUERY=SELECT
...' protocol specification
-
-statement error 42000!SELECT: proto_loader function failed 'odbc_loader Could
not connect. SQLDriverConnect failed. SQLstate HY000, Errnr 14, Message
[SQLite]connect failed'
-select * from
proto_loader('odbc:DRIVER=$TSTDATAPATH/sqlite3odbc/libsqlite3odbc-0.99991.so;QUERY=SELECT
* FROM INFORMATION_SCHEMA.TABLES')
-
-statement error 42000!SELECT: proto_loader function failed 'odbc_loader Could
not connect. SQLDriverConnect failed. SQLstate HY000, Errnr 14, Message
[SQLite]connect failed'
-select * from
proto_loader('odbc:DRIVER=$TSTDATAPATH/sqlite3odbc/libsqlite3odbc-0.99991.so;Database=~/Downloads/sqlite_dbs/chinook.db;QUERY=SELECT
* FROM INFORMATION_SCHEMA.TABLES')
-
-statement error 42000!SELECT: proto_loader function failed 'odbc_loader
SQLExecDirect query failed. SQLstate HY000, Errnr 1, Message [SQLite]no such
table: INFORMATION_SCHEMA.TABLES (1)'
-select * from
proto_loader('odbc:DRIVER=$TSTDATAPATH/sqlite3odbc/libsqlite3odbc-0.99991.so;Database=odbc_loader_test.db;QUERY=SELECT
* FROM INFORMATION_SCHEMA.TABLES')
-
-query TTT nosort
-select * from
proto_loader('odbc:DRIVER=$TSTDATAPATH/sqlite3odbc/libsqlite3odbc-0.99991.so;Database=odbc_loader_test.db;QUERY=SELECT
type, name, tbl_name FROM sqlite_schema ORDER BY 1,2,3')
-----
-
-query TTTIT nosort
-select * from
proto_loader('odbc:DRIVER=$TSTDATAPATH/sqlite3odbc/libsqlite3odbc-0.99991.so;Database=odbc_loader_test.db;QUERY=SELECT
* FROM sqlite_schema ORDER BY 1,2,3')
-----
-
-query TTTT nosort
-select * from
proto_loader('odbc:DRIVER=$TSTDATAPATH/sqlite3odbc/libsqlite3odbc-0.99991.so;Database=$TSTDATAPATH/sqlite3odbc/chinook.db;QUERY=SELECT
tbl_name, type, name, sql FROM sqlite_schema ORDER BY 1,2 DESC,3')
-----
-albums
-table
-albums
-CREATE TABLE "albums"@@(@@ [AlbumId] INTEGER PRIMARY KEY AUTOINCREMENT NOT
NULL,@@ [Title] NVARCHAR(160) NOT NULL,@@ [ArtistId] INTEGER NOT
NULL,@@ FOREIGN KEY ([ArtistId]) REFERENCES "artists" ([ArtistId]) @@@@ON
DELETE NO ACTION ON UPDATE NO ACTION@@)
-albums
-index
-IFK_AlbumArtistId
-CREATE INDEX [IFK_AlbumArtistId] ON "albums" ([ArtistId])
-artists
-table
-artists
-CREATE TABLE "artists"@@(@@ [ArtistId] INTEGER PRIMARY KEY AUTOINCREMENT
NOT NULL,@@ [Name] NVARCHAR(120)@@)
-customers
-table
-customers
-CREATE TABLE "customers"@@(@@ [CustomerId] INTEGER PRIMARY KEY
AUTOINCREMENT NOT NULL,@@ [FirstName] NVARCHAR(40) NOT NULL,@@
[LastName] NVARCHAR(20) NOT NULL,@@ [Company] NVARCHAR(80),@@ [Address]
NVARCHAR(70),@@ [City] NVARCHAR(40),@@ [State] NVARCHAR(40),@@
[Country] NVARCHAR(40),@@ [PostalCode] NVARCHAR(10),@@ [Phone]
NVARCHAR(24),@@ [Fax] NVARCHAR(24),@@ [Email] NVARCHAR(60) NOT NULL,@@
[SupportRepId] INTEGER,@@ FOREIGN KEY ([SupportRepId]) REFERENCES
"employees" ([EmployeeId]) @@@@ON DELETE NO ACTION ON UPDATE NO ACTION@@)
-customers
-index
-IFK_CustomerSupportRepId
-CREATE INDEX [IFK_CustomerSupportRepId] ON "customers" ([SupportRepId])
-employees
-table
-employees
-CREATE TABLE "employees"@@(@@ [EmployeeId] INTEGER PRIMARY KEY
AUTOINCREMENT NOT NULL,@@ [LastName] NVARCHAR(20) NOT NULL,@@
[FirstName] NVARCHAR(20) NOT NULL,@@ [Title] NVARCHAR(30),@@ [ReportsTo]
INTEGER,@@ [BirthDate] DATETIME,@@ [HireDate] DATETIME,@@ [Address]
NVARCHAR(70),@@ [City] NVARCHAR(40),@@ [State] NVARCHAR(40),@@
[Country] NVARCHAR(40),@@ [PostalCode] NVARCHAR(10),@@ [Phone]
NVARCHAR(24),@@ [Fax] NVARCHAR(24),@@ [Email] NVARCHAR(60),@@ FOREIGN
KEY ([ReportsTo]) REFERENCES "employees" ([EmployeeId]) @@@@ON DELETE NO ACTION
ON UPDATE NO ACTION@@)
-employees
-index
-IFK_EmployeeReportsTo
-CREATE INDEX [IFK_EmployeeReportsTo] ON "employees" ([ReportsTo])
-genres
-table
-genres
-CREATE TABLE "genres"@@(@@ [GenreId] INTEGER PRIMARY KEY AUTOINCREMENT NOT
NULL,@@ [Name] NVARCHAR(120)@@)
-invoice_items
-table
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
