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
70 changes: 70 additions & 0 deletions src/sql/CreateStatement.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#include "SelectStatement.h"
Comment thread
Bouncner marked this conversation as resolved.
#include "CreateStatement.h"

namespace hsql {

// CreateStatemnet
CreateStatement::CreateStatement(CreateType type)
: SQLStatement(kStmtCreate),
type(type),
ifNotExists(false),
filePath(nullptr),
schema(nullptr),
tableName(nullptr),
indexName(nullptr),
indexColumns(nullptr),
columns(nullptr),
tableConstraints(nullptr),
viewColumns(nullptr),
select(nullptr){};

CreateStatement::~CreateStatement() {
free(filePath);
free(schema);
free(tableName);
free(indexName);
delete select;

if (columns != nullptr) {
for (ColumnDefinition* def : *columns) {
delete def;
}
delete columns;
}

if (tableConstraints != nullptr) {
for (TableConstraint* def : *tableConstraints) {
delete def;
}
delete tableConstraints;
}

if (indexColumns != nullptr) {
for (char* column : *indexColumns) {
free(column);
}
delete indexColumns;
}

if (viewColumns != nullptr) {
for (char* column : *viewColumns) {
free(column);
}
delete viewColumns;
}
}

void CreateStatement::setColumnDefsAndConstraints(std::vector<TableElement*>* tableElements) {
columns = new std::vector<ColumnDefinition*>();
tableConstraints = new std::vector<TableConstraint*>();

for (auto tableElem : *tableElements) {
if (auto* colDef = dynamic_cast<ColumnDefinition*>(tableElem)) {
columns->emplace_back(colDef);
} else if (auto* tableConstraint = dynamic_cast<TableConstraint*>(tableElem)) {
tableConstraints->emplace_back(tableConstraint);
}
}
}

} // namespace hsql
15 changes: 2 additions & 13 deletions src/sql/CreateStatement.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct ColumnDefinition : TableElement {
}
nullable = false;
}

return true;
}

Expand All @@ -66,18 +66,7 @@ struct CreateStatement : SQLStatement {
CreateStatement(CreateType type);
~CreateStatement() override;

void setColumnDefsAndConstraints(std::vector<TableElement*>* tableElements) {
columns = new std::vector<ColumnDefinition*>();
tableConstraints = new std::vector<TableConstraint*>();

for (auto tableElem : *tableElements) {
if (auto* colDef = dynamic_cast<ColumnDefinition*>(tableElem)) {
columns->emplace_back(colDef);
} else if (auto* tableConstraint = dynamic_cast<TableConstraint*>(tableElem)) {
tableConstraints->emplace_back(tableConstraint);
}
}
}
void setColumnDefsAndConstraints(std::vector<TableElement*>* tableElements);

CreateType type;
bool ifNotExists; // default: false
Expand Down
51 changes: 0 additions & 51 deletions src/sql/statements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,57 +87,6 @@ std::ostream& operator<<(std::ostream& stream, const ColumnType& column_type) {
return stream;
}

// CreateStatemnet
CreateStatement::CreateStatement(CreateType type)
: SQLStatement(kStmtCreate),
type(type),
ifNotExists(false),
filePath(nullptr),
schema(nullptr),
tableName(nullptr),
indexName(nullptr),
indexColumns(nullptr),
columns(nullptr),
tableConstraints(nullptr),
viewColumns(nullptr),
select(nullptr){};

CreateStatement::~CreateStatement() {
free(filePath);
free(schema);
free(tableName);
free(indexName);
delete select;

if (columns != nullptr) {
for (ColumnDefinition* def : *columns) {
delete def;
}
delete columns;
}

if (tableConstraints != nullptr) {
for (TableConstraint* def : *tableConstraints) {
delete def;
}
delete tableConstraints;
}

if (indexColumns != nullptr) {
for (char* column : *indexColumns) {
free(column);
}
delete indexColumns;
}

if (viewColumns != nullptr) {
for (char* column : *viewColumns) {
free(column);
}
delete viewColumns;
}
}

// DeleteStatement
DeleteStatement::DeleteStatement() : SQLStatement(kStmtDelete), schema(nullptr), tableName(nullptr), expr(nullptr){};

Expand Down