Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions DBMS/DBMS/dbManage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ bool DBManager::insertRecord(RecordEntry *input, string colName[], string tableN
SysObject* table = sysManager.findTable(tableName);
if(table == NULL)
return false;
SysColumn* column;
for( UINT i = 0; i < table->vecCols.size(); i++ ){
SysColumn* column = sysManager.findColumn(colName[i], tableName);
column = sysManager.findColumn(colName[i], tableName);
if (column->xtype == VARCHAR_TYPE) {
string temp(dataUtility::getbyte((char*)(input->item[i]),0,input->length[i]));
if(dataUtility::toUpper(temp).compare("NULL") !=0 ){//!isNull
Expand Down Expand Up @@ -617,17 +618,24 @@ vector<SysColumn*> DBManager::getTableAttr(string tableName) {
bool DBManager::checkTableColumn(string tableName, string columnName) {
vector<SysColumn*> sysColumns = getTableAttr(tableName);
for (int i = 0; i < sysColumns.size(); i++) {
if (sysColumns[i]->name == columnName)
if (sysColumns[i]->name == columnName) {
sysColumns.clear();
return true;
}
}
sysColumns.clear();
return false;
}
SysColumn* DBManager::getTableColumn(string tableName, string columnName) {
vector<SysColumn*> sysColumns = getTableAttr(tableName);
SysColumn* res;
if (checkTableColumn(tableName, columnName)) {
for (int i = 0; i < sysColumns.size(); i++) {
if (sysColumns[i]->name == columnName)
return sysColumns[i];
if (sysColumns[i]->name == columnName) {
res = sysColumns[i];
sysColumns.clear();
return res;
}
}
}
}
Expand Down
Binary file added DBMS/DBMS/orderDB/_sysFile
Binary file not shown.
Binary file added DBMS/DBMS/orderDB/book
Binary file not shown.
Binary file added DBMS/DBMS/orderDB/customer
Binary file not shown.
Binary file added DBMS/DBMS/orderDB/orders
Binary file not shown.
Binary file added DBMS/DBMS/orderDB/publisher
Binary file not shown.
24 changes: 24 additions & 0 deletions DBMS/DBMS/wq_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ void parser::testParse(){
printf("input quit, get into the quit mode.\n");
printf("input other string, start to execute in your choose mode, default one sql command.\n");
bool fileFlag = false;
bool oneStringFlag = false;
string oneString="";
while(true) {
printf(">>\n");
scanf("%s",executeInst);
Expand Down Expand Up @@ -47,6 +49,28 @@ void parser::testParse(){
if (temp.length() > 0)
res.push_back(temp);
}
for (int i = 0; i < res.size(); i++) {
if (res[i].length() > 0 && res[i].at(0) == '\'' && oneStringFlag == false) {
oneString = res[i];
oneStringFlag = true;
res.erase(res.begin()+i);
i--;
} else if (res[i].length() > 0 && res[i].at(res[i].length()-1) == '\'' && oneStringFlag == true){
oneString += ' ';
oneString += res[i];
oneStringFlag = false;
res.erase(res.begin()+i);
res.insert(res.begin()+i, oneString);
oneString = "";
} else {
if (oneStringFlag == true) {
oneString += ' ';
oneString += res[i];
res.erase(res.begin()+i);
i--;
}
}
}
if (!parserOneCommand(res))
cout << "*************This command is wrong.*************************" << endl;
else
Expand Down
Binary file modified originInsertData/orderDB/book
Binary file not shown.
Binary file modified originInsertData/orderDB/customer
Binary file not shown.
Binary file modified originInsertData/orderDB/orders
Binary file not shown.
Binary file modified originInsertData/orderDB/publisher
Binary file not shown.