droid vs myddas

packages/myddas/sqlite3/sqlitest.yap

@@ -2,7 +2,7 @@
 
 :- use_module(library(lists)).
 :- use_module(library(maplist)).
-:- use_module(library(myddas)).
+:- use_module(myddas_core).
 
 main :-
 		 init,
@@ -14,17 +14,17 @@ main_ :-
 main_ .
 
 init :-
-    catch(db_open(sqlite3,data('chinook.db'),_,_), _, fail),
+    catch(db_open(sqlite3,con,('chinook.db'),_,_), _, fail),
     %   db_open(sqlite3, 'chinook.db', _, _),
     writeln('chinook has landed').
 
 go :-
     writeln(('db_import')),
-    db_import('artists', artists),
+    db_import(con,'artists', artists),
     writeln(('artist -> artists')),
-	db_import('albums', albums),
+	db_import(con,'albums', albums),
     writeln(('albums -> albums')),
-	db_import('tracks', tracks),
+	db_import(con,'tracks', tracks),
     writeln(('tracks -> tracks')).
 
 
@@ -34,31 +34,31 @@ go :-
     writeln(X:Y).
 go :-
     		writeln(db_get_attributes_types),
-    		db_get_attributes_types(albums,Als),
+    		db_get_attributes_types(con,albums,Als),
     format('~w -> ~w~n',[albums,Als]),
-		db_get_attributes_types(tracks,Ts),
+		db_get_attributes_types(con,tracks,Ts),
   	        format('~w -> ~w~n',[tracks,Ts]),
-	db_get_attributes_types(artists,As),
+	db_get_attributes_types(con,artists,As),
 	     format('~w -> ~w~n',[artists,As]).
 go :-
 	writeln(db_number_of_fields),
-	db_number_of_fields(albums,Als),
-	db_number_of_fields(tracks,Ts),
-	db_number_of_fields(artists,As),
+	db_number_of_fields(con,albums,Als),
+	db_number_of_fields(con,tracks,Ts),
+	db_number_of_fields(con,artists,As),
 	writeln(As:Als:Ts).
 
 go :-
 
-		db_describe(albums, Desc), writeln(albums:Desc).
+		db_describe(con,albums, Desc), writeln(albums:Desc).
 go :-
-		db_describe(tracks, Desc), writeln(tracks:Desc).
+		db_describe(con,tracks, Desc), writeln(tracks:Desc).
 go :-
-			db_describe(artists, Desc), writeln(artists:Desc).
+			db_describe(con,artists, Desc), writeln(artists:Desc).
 go :-
-				db_show_tables(Desc), writeln(tables:Desc).
+				db_show_tables(con,Desc), writeln(tables:Desc).
 go :-
-					db_show_tables(table(T)),
-					db_describe(T,tableinfo(FieldID,Type,Null,Primary,Default,'')),
+					db_show_tables(con,table(T)),
+					db_describe(con,T,tableinfo(FieldID,Type,Null,Primary,Default,'')),
 					 writeln(T:tableinfo(FieldID,Type,Null,Primary,Default,'')).
 
 
@@ -91,8 +91,7 @@ go_cut1 :-
     !.
 
 close :-
-	db_close.
+	db_close(con).
 
 
-
-:- initialization(main).
+:- initialization(main, now).