Menu
▾
▴
[Tora-cvs] tora NEWS,1.886,1.887 tohighlightedtext.cpp,1.84,1.85 tooracleconnection.cpp,1.77,1.78 toresultlock.cpp,1.34,1.35 toresultlock.h,1.20,1.21 toresultview.cpp,1.127,1.128 toresultview.h,1.59,1.60
Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv32044
Modified Files:
NEWS tohighlightedtext.cpp tooracleconnection.cpp
toresultlock.cpp toresultlock.h toresultview.cpp
toresultview.h
Log Message:
Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.886
retrieving revision 1.887
diff -C2 -d -r1.886 -r1.887
*** NEWS 27 Jul 2003 18:37:24 -0000 1.886
--- NEWS 27 Jul 2003 21:52:24 -0000 1.887
***************
*** 1,4 ****
--- 1,7 ----
1.3.11:
+ 2003-07-27: Fixed Qt 3.0 compile problem.
+ 2003-07-27: Fixed code completion on package members.
+ 2003-07-27: Added more internal lock types.
2003-07-27: Don't show main window until after import of session (For more flickerfree startup).
2003-07-27: Added tab stop setting.
Index: tohighlightedtext.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tohighlightedtext.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** tohighlightedtext.cpp 27 Jul 2003 18:37:25 -0000 1.84
--- tohighlightedtext.cpp 27 Jul 2003 21:52:24 -0000 1.85
***************
*** 712,716 ****
for (toQDescList::iterator i=desc.begin();
i!=desc.end();i++) {
! QString t=conn.quote((*i).Name);
if (!(*i).Comment.isEmpty()) {
t+=QString::fromLatin1(" - ");
--- 712,721 ----
for (toQDescList::iterator i=desc.begin();
i!=desc.end();i++) {
! QString t;
! int ind=(*i).Name.find("(");
! if (ind>=0)
! t=conn.quote((*i).Name.mid(0,ind))+(*i).Name.mid(ind);
! else
! t=conn.quote((*i).Name);
if (!(*i).Comment.isEmpty()) {
t+=QString::fromLatin1(" - ");
Index: tooracleconnection.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tooracleconnection.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** tooracleconnection.cpp 27 Jul 2003 14:06:13 -0000 1.77
--- tooracleconnection.cpp 27 Jul 2003 21:52:24 -0000 1.78
***************
*** 87,91 ****
" WHERE Owner = :f1<char[100]>\n"
" AND Package_Name = :f2<char[100]>\n"
! " ORDER BY object_name,overload,sequence",
"Get list of package members");
--- 87,91 ----
" WHERE Owner = :f1<char[100]>\n"
" AND Package_Name = :f2<char[100]>\n"
! " ORDER BY object_name,overload,DECODE(argument_name,NULL,9999,sequence)",
"Get list of package members");
***************
*** 564,572 ****
try {
toQuery::queryDescribe desc;
! desc.Datatype=QString::fromLatin1("MEMBER");
desc.Null=false;
QString lastName;
QString lastOver;
toQuery member(connection(),SQLMembers,table.Owner,table.Name);
while(!member.eof()) {
QString name = member.readValue();
--- 564,573 ----
try {
toQuery::queryDescribe desc;
! desc.Datatype=("MEMBER");
desc.Null=false;
QString lastName;
QString lastOver;
toQuery member(connection(),SQLMembers,table.Owner,table.Name);
+ bool hasArgs=false;
while(!member.eof()) {
QString name = member.readValue();
***************
*** 575,580 ****
QString type = member.readValueNull();
if (lastName!=name||overld!=lastOver) {
! if (desc.Name.contains(QString::fromLatin1("(")))
! desc.Name+=QString::fromLatin1(")");
if (!desc.Name.isEmpty())
ret.insert(ret.end(),desc);
--- 576,581 ----
QString type = member.readValueNull();
if (lastName!=name||overld!=lastOver) {
! if (hasArgs)
! desc.Name+=")";
if (!desc.Name.isEmpty())
ret.insert(ret.end(),desc);
***************
*** 582,595 ****
lastName=name;
lastOver=overld;
! if (!arg.isEmpty())
! desc.Name+=QString::fromLatin1(" (");
! } else
! desc.Name+=QString::fromLatin1(", ");
! desc.Name+=arg;
! desc.Name+=QString::fromLatin1(" ");
desc.Name+=type;
}
! if (desc.Name.contains(QString::fromLatin1("(")))
! desc.Name+=QString::fromLatin1(")");
if (!desc.Name.isEmpty())
ret.insert(ret.end(),desc);
--- 583,608 ----
lastName=name;
lastOver=overld;
! hasArgs=false;
! }
! if (arg.isEmpty()) {
! if (hasArgs) {
! desc.Name+=")";
! hasArgs=false;
! }
! desc.Name+=" RETURNING ";
! } else {
! if (hasArgs)
! desc.Name+=", ";
! else {
! desc.Name+="(";
! hasArgs=true;
! }
! desc.Name+=arg;
! desc.Name+=" ";
! }
desc.Name+=type;
}
! if (desc.Name.contains("("))
! desc.Name+=")";
if (!desc.Name.isEmpty())
ret.insert(ret.end(),desc);
Index: toresultlock.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultlock.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** toresultlock.cpp 17 Jul 2002 10:39:08 -0000 1.34
--- toresultlock.cpp 27 Jul 2003 21:52:24 -0000 1.35
***************
*** 80,84 ****
static toSQL SQLBlockingLock("toResultLock:BlockingLocks",
"select b.sid,b.schemaname,b.osuser,b.program,\n"
! " DECODE(a.type,'TM','DML enqueue','TX','Transaction enqueue','UL','User supplied','Internal ('||a.type||')'),\n"
" DECODE(a.lmode,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(a.lmode)),\n"
" DECODE(a.request,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(a.request)),\n"
--- 80,104 ----
static toSQL SQLBlockingLock("toResultLock:BlockingLocks",
"select b.sid,b.schemaname,b.osuser,b.program,\n"
! " decode(a.type,\n"
! " 'MR', 'Media Recovery',\n"
! " 'RT', 'Redo Thread',\n"
! " 'UN', 'User Name',\n"
! " 'TX', 'Transaction',\n"
! " 'TM', 'DML',\n"
! " 'UL', 'PL/SQL User Lock',\n"
! " 'DX', 'Distributed Xaction',\n"
! " 'CF', 'Control File',\n"
! " 'IS', 'Instance State',\n"
! " 'FS', 'File Set',\n"
! " 'IR', 'Instance Recovery',\n"
! " 'ST', 'Disk Space Transaction',\n"
! " 'TS', 'Temp Segment',\n"
! " 'IV', 'Library Cache Invalidation',\n"
! " 'LS', 'Log Start or Switch',\n"
! " 'RW', 'Row Wait',\n"
! " 'SQ', 'Sequence Number',\n"
! " 'TE', 'Extend Table',\n"
! " 'TT', 'Temp Table',\n"
! " 'Internal ('||a.type||')'),\n"
" DECODE(a.lmode,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(a.lmode)),\n"
" DECODE(a.request,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(a.request)),\n"
***************
*** 106,110 ****
" b.osuser,\n"
" b.program,\n"
! " DECODE(e.type,'TM','DML enqueue','TX','Transaction enqueue','UL','User supplied','Internal ('||a.type||')'),\n"
" DECODE(a.lmode,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(a.lmode)),\n"
" DECODE(e.request,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(e.request)),\n"
--- 126,150 ----
" b.osuser,\n"
" b.program,\n"
! " decode(a.type,\n"
! " 'MR', 'Media Recovery',\n"
! " 'RT', 'Redo Thread',\n"
! " 'UN', 'User Name',\n"
! " 'TX', 'Transaction',\n"
! " 'TM', 'DML',\n"
! " 'UL', 'PL/SQL User Lock',\n"
! " 'DX', 'Distributed Xaction',\n"
! " 'CF', 'Control File',\n"
! " 'IS', 'Instance State',\n"
! " 'FS', 'File Set',\n"
! " 'IR', 'Instance Recovery',\n"
! " 'ST', 'Disk Space Transaction',\n"
! " 'TS', 'Temp Segment',\n"
! " 'IV', 'Library Cache Invalidation',\n"
! " 'LS', 'Log Start or Switch',\n"
! " 'RW', 'Row Wait',\n"
! " 'SQ', 'Sequence Number',\n"
! " 'TE', 'Extend Table',\n"
! " 'TT', 'Temp Table',\n"
! " 'Internal ('||a.type||')'),\n"
" DECODE(a.lmode,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(a.lmode)),\n"
" DECODE(e.request,0,'None',1,'Null',2,'Row-S',3,'Row-X',4,'Share',5,'S/Row-X',6,'Exclusive',TO_CHAR(e.request)),\n"
Index: toresultlock.h
===================================================================
RCS file: /cvsroot/tora/tora/toresultlock.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** toresultlock.h 16 Dec 2001 01:17:04 -0000 1.20
--- toresultlock.h 27 Jul 2003 21:52:24 -0000 1.21
***************
*** 55,60 ****
virtual void query(const QString &sql,const toQList ¶m);
! // Why is this needed?
! void query(const QString &sql)
{ toQList p; query(sql,p); }
/** Support Oracle
--- 55,60 ----
virtual void query(const QString &sql,const toQList ¶m);
!
! virtual void query(const QString &sql)
{ toQList p; query(sql,p); }
/** Support Oracle
Index: toresultview.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultview.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** toresultview.cpp 25 Jul 2003 14:47:39 -0000 1.127
--- toresultview.cpp 27 Jul 2003 21:52:24 -0000 1.128
***************
*** 230,233 ****
--- 230,251 ----
}
+ toResultViewCheck::toResultViewCheck(QListView *parent,QListViewItem *after,const QString &text,QCheckListItem::Type type)
+ #if QT_VERSION >= 0x030100
+ : QCheckListItem(parent,after,QString::null,type)
+ { ColumnData=NULL; ColumnCount=0; if (!text.isNull()) setText(0,text); }
+ #else
+ : QCheckListItem(parent,QString::null,type)
+ { moveItem(after); ColumnData=NULL; ColumnCount=0; if (!text.isNull()) setText(0,text); }
+ #endif
+
+ toResultViewCheck::toResultViewCheck(QListViewItem *parent,QListViewItem *after,const QString &text,QCheckListItem::Type type)
+ #if QT_VERSION >= 0x030100
+ : QCheckListItem(parent,after,QString::null,type)
+ { ColumnData=NULL; ColumnCount=0; if (!text.isNull()) setText(0,text); }
+ #else
+ : QCheckListItem(parent,QString::null,type)
+ { moveItem(after); ColumnData=NULL; ColumnCount=0; if (!text.isNull()) setText(0,text); }
+ #endif
+
void toResultViewCheck::setText (int col,const QString &txt)
{
Index: toresultview.h
===================================================================
RCS file: /cvsroot/tora/tora/toresultview.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** toresultview.h 23 Apr 2003 01:37:12 -0000 1.59
--- toresultview.h 27 Jul 2003 21:52:24 -0000 1.60
***************
*** 244,250 ****
* @param type Type of check on this item.
*/
! toResultViewCheck(QListView *parent,QListViewItem *after,const QString &text,QCheckListItem::Type type=Controller)
! : QCheckListItem(parent,after,QString::null,type)
! { ColumnData=NULL; ColumnCount=0; if (!text.isNull()) setText(0,text); }
/** Create a new item.
* @param parent Parent item.
--- 244,248 ----
* @param type Type of check on this item.
*/
! toResultViewCheck(QListView *parent,QListViewItem *after,const QString &text,QCheckListItem::Type type=Controller);
/** Create a new item.
* @param parent Parent item.
***************
*** 253,259 ****
* @param type Type of check on this item.
*/
! toResultViewCheck(QListViewItem *parent,QListViewItem *after,const QString &text,QCheckListItem::Type type=Controller)
! : QCheckListItem(parent,after,QString::null,type)
! { ColumnData=NULL; ColumnCount=0; if (!text.isNull()) setText(0,text); }
/** Reimplemented for internal reasons.
*/
--- 251,255 ----
* @param type Type of check on this item.
*/
! toResultViewCheck(QListViewItem *parent,QListViewItem *after,const QString &text,QCheckListItem::Type type=Controller);
/** Reimplemented for internal reasons.
*/
|