GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Parse foreign key clauses instead of just treating them as a big string · feiva/sqlitebrowser@0e18e36

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/EditTableDialog.cpp‎`

Copy file name to clipboardExpand all lines: src/EditTableDialog.cpp

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void EditTableDialog::populateFields()`
`115`	`115`	`tbitem->setText(kDefault, f->defaultValue());`
`116`	`116`
`117`	`117`	`tbitem->setText(kCheck, f->check());`
`118`		`- tbitem->setText(kForeignKey, f->foreignKey());`
	`118`	`+ tbitem->setText(kForeignKey, f->foreignKey().toString());`
`119`	`119`	`ui->treeWidget->addTopLevelItem(tbitem);`
`120`	`120`	`}`
`121`	`121`
`@@ -374,7 +374,9 @@ void EditTableDialog::itemChanged(QTreeWidgetItem *item, int column)`
`374`	`374`	`callRenameColumn = true;`
`375`	`375`	`break;`
`376`	`376`	`case kForeignKey:`
`377`		`- field->setForeignKey(item->text(column));`
	`377`	`+ sqlb::ForeignKeyClause fk;`
	`378`	`+ fk.setFromString(item->text(column));`
	`379`	`+ field->setForeignKey(fk);`
`378`	`380`	`if(!m_bNewTable)`
`379`	`381`	`callRenameColumn = true;`
`380`	`382`	`break;`

Collapse file

`‎src/sqlitetypes.cpp‎`

Copy file name to clipboardExpand all lines: src/sqlitetypes.cpp

+83-5Lines changed: 83 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,41 @@ namespace sqlb {`
`9`	`9`
`10`	`10`	`QStringList Field::Datatypes = QStringList() << "INTEGER" << "TEXT" << "BLOB" << "REAL" << "NUMERIC";`
`11`	`11`
	`12`	`+bool ForeignKeyClause::isSet() const`
	`13`	`+{`
	`14`	`+ return m_override.size() \|\| m_table.size();`
	`15`	`+}`
	`16`	`+`
	`17`	`+QString ForeignKeyClause::toString() const`
	`18`	`+{`
	`19`	`+ if(!isSet())`
	`20`	`+ return QString();`
	`21`	`+`
	`22`	`+ if(m_override.size())`
	`23`	`+ return m_override;`
	`24`	`+`
	`25`	+ QString result = "`" + m_table + "`";
	`26`	`+`
	`27`	`+ if(m_columns.size())`
	`28`	`+ {`
	`29`	`+ result += "(";`
	`30`	`+ foreach(const QString& column, m_columns)`
	`31`	+ result += "`" + column + "`,";
	`32`	`+ result.chop(1); // Remove last comma`
	`33`	`+ result += ")";`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ if(m_constraint.size())`
	`37`	`+ result += " " + m_constraint;`
	`38`	`+`
	`39`	`+ return result;`
	`40`	`+}`
	`41`	`+`
	`42`	`+void ForeignKeyClause::setFromString(const QString& fk)`
	`43`	`+{`
	`44`	`+ m_override = fk;`
	`45`	`+}`
	`46`	`+`
`12`	`47`	`QString Field::toString(const QString& indent, const QString& sep) const`
`13`	`48`	`{`
`14`	`49`	QString str = indent + '`' + m_name + '`' + sep + m_type;
`@@ -194,8 +229,8 @@ QString Table::sql() const`
`194`	`229`	`// foreign keys`
`195`	`230`	`foreach(FieldPtr f, m_fields)`
`196`	`231`	`{`
`197`		`- if(!f->foreignKey().isEmpty())`
`198`		- sql += QString(",\n\tFOREIGN KEY(`%1`) REFERENCES %2").arg(f->name()).arg(f->foreignKey());
	`232`	`+ if(f->foreignKey().isSet())`
	`233`	+ sql += QString(",\n\tFOREIGN KEY(`%1`) REFERENCES %2").arg(f->name()).arg(f->foreignKey().toString());
`199`	`234`	`}`
`200`	`235`
`201`	`236`	`sql += "\n)";`
`@@ -372,6 +407,8 @@ Table CreateTableWalker::table()`
`372`	`407`	`break;`
`373`	`408`	`case sqlite3TokenTypes::FOREIGN:`
`374`	`409`	`{`
	`410`	`+ sqlb::ForeignKeyClause fk;`
	`411`	`+`
`375`	`412`	`tc = tc->getNextSibling(); // FOREIGN`
`376`	`413`	`tc = tc->getNextSibling(); // KEY`
`377`	`414`	`tc = tc->getNextSibling(); // LPAREN`
`@@ -386,7 +423,28 @@ Table CreateTableWalker::table()`
`386`	`423`	`tc = tc->getNextSibling(); // RPAREN`
`387`	`424`	`tc = tc->getNextSibling(); // REFERENCES`
`388`	`425`
`389`		`- tab.fields().at(tab.findField(column_name))->setForeignKey(concatTextAST(tc, true));`
	`426`	`+ fk.setTable(identifier(tc));`
	`427`	`+ tc = tc->getNextSibling(); // identifier`
	`428`	`+`
	`429`	`+ if(tc != antlr::nullAST && tc->getType() == sqlite3TokenTypes::LPAREN)`
	`430`	`+ {`
	`431`	`+ tc = tc->getNextSibling(); // LPAREN`
	`432`	`+`
	`433`	`+ QStringList fk_cols;`
	`434`	`+ while(tc != antlr::nullAST && tc->getType() != sqlite3TokenTypes::RPAREN)`
	`435`	`+ {`
	`436`	`+ if(tc->getType() != sqlite3TokenTypes::COMMA)`
	`437`	`+ fk_cols.push_back(identifier(tc));`
	`438`	`+ tc = tc->getNextSibling();`
	`439`	`+ }`
	`440`	`+ fk.setColumns(fk_cols);`
	`441`	`+`
	`442`	`+ tc = tc->getNextSibling(); // RPAREN`
	`443`	`+ }`
	`444`	`+`
	`445`	`+ fk.setConstraint(concatTextAST(tc, true));`
	`446`	`+`
	`447`	`+ tab.fields().at(tab.findField(column_name))->setForeignKey(fk);`
`390`	`448`	`}`
`391`	`449`	`break;`
`392`	`450`	`default:`
`@@ -423,7 +481,7 @@ void CreateTableWalker::parsecolumn(FieldPtr& f, antlr::RefAST c)`
`423`	`481`	`bool unique = false;`
`424`	`482`	`QString defaultvalue;`
`425`	`483`	`QString check;`
`426`		`- QString foreignKey;`
	`484`	`+ sqlb::ForeignKeyClause foreignKey;`
`427`	`485`
`428`	`486`	`colname = columnname(c);`
`429`	`487`	`c = c->getNextSibling(); //type?`
`@@ -491,7 +549,27 @@ void CreateTableWalker::parsecolumn(FieldPtr& f, antlr::RefAST c)`
`491`	`549`	`case sqlite3TokenTypes::REFERENCES:`
`492`	`550`	`{`
`493`	`551`	`con = con->getNextSibling(); // REFERENCES`
`494`		`- foreignKey = concatTextAST(con, true);`
	`552`	`+`
	`553`	`+ foreignKey.setTable(identifier(con));`
	`554`	`+ con = con->getNextSibling(); // identifier`
	`555`	`+`
	`556`	`+ if(con != antlr::nullAST && con->getType() == sqlite3TokenTypes::LPAREN)`
	`557`	`+ {`
	`558`	`+ con = con->getNextSibling(); // LPAREN`
	`559`	`+`
	`560`	`+ QStringList fk_cols;`
	`561`	`+ while(con != antlr::nullAST && con->getType() != sqlite3TokenTypes::RPAREN)`
	`562`	`+ {`
	`563`	`+ if(con->getType() != sqlite3TokenTypes::COMMA)`
	`564`	`+ fk_cols.push_back(identifier(con));`
	`565`	`+ con = con->getNextSibling();`
	`566`	`+ }`
	`567`	`+ foreignKey.setColumns(fk_cols);`
	`568`	`+`
	`569`	`+ con = con->getNextSibling(); // RPAREN`
	`570`	`+ }`
	`571`	`+`
	`572`	`+ foreignKey.setConstraint(concatTextAST(con, true));`
`495`	`573`	`}`
`496`	`574`	`break;`
`497`	`575`	`default:`

Collapse file

`‎src/sqlitetypes.h‎`

Copy file name to clipboardExpand all lines: src/sqlitetypes.h

+35-3Lines changed: 35 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,38 @@`
`12`	`12`
`13`	`13`	`namespace sqlb {`
`14`	`14`
	`15`	`+class ForeignKeyClause`
	`16`	`+{`
	`17`	`+public:`
	`18`	`+ ForeignKeyClause(const QString& table = QString(), const QStringList& columns = QStringList(), const QString& constraint = QString())`
	`19`	`+ : m_table(table),`
	`20`	`+ m_columns(columns),`
	`21`	`+ m_constraint(constraint),`
	`22`	`+ m_override(QString())`
	`23`	`+ {`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ bool isSet() const;`
	`27`	`+ QString toString() const;`
	`28`	`+ void setFromString(const QString& fk);`
	`29`	`+`
	`30`	`+ void setTable(const QString& table) { m_override = QString(); m_table = table; }`
	`31`	`+ const QString& table() const { return m_table; }`
	`32`	`+`
	`33`	`+ void setColumns(const QStringList& columns) { m_columns = columns; }`
	`34`	`+ const QStringList& columns() const { return m_columns; }`
	`35`	`+`
	`36`	`+ void setConstraint(const QString& constraint) { m_constraint = constraint; }`
	`37`	`+ const QString& constraint() const { return m_constraint; }`
	`38`	`+`
	`39`	`+private:`
	`40`	`+ QString m_table;`
	`41`	`+ QStringList m_columns;`
	`42`	`+ QString m_constraint;`
	`43`	`+`
	`44`	`+ QString m_override;`
	`45`	`+};`
	`46`	`+`
`15`	`47`	`class Field`
`16`	`48`	`{`
`17`	`49`	`public:`
`@@ -42,7 +74,7 @@ class Field`
`42`	`74`	`void setAutoIncrement(bool autoinc) { m_autoincrement = autoinc; }`
`43`	`75`	`void setPrimaryKey(bool pk) { m_primaryKey = pk; }`
`44`	`76`	`void setUnique(bool u) { m_unique = u; }`
`45`		`- void setForeignKey(const QString& key) { m_foreignKey = key; }`
	`77`	`+ void setForeignKey(const ForeignKeyClause& key) { m_foreignKey = key; }`
`46`	`78`
`47`	`79`	`bool isText() const;`
`48`	`80`	`bool isInteger() const;`
`@@ -55,7 +87,7 @@ class Field`
`55`	`87`	`bool autoIncrement() const { return m_autoincrement; }`
`56`	`88`	`bool primaryKey() const { return m_primaryKey; }`
`57`	`89`	`bool unique() const { return m_unique; }`
`58`		`- const QString& foreignKey() const { return m_foreignKey; }`
	`90`	`+ const ForeignKeyClause& foreignKey() const { return m_foreignKey; }`
`59`	`91`
`60`	`92`	`static QStringList Datatypes;`
`61`	`93`	`private:`
`@@ -64,7 +96,7 @@ class Field`
`64`	`96`	`bool m_notnull;`
`65`	`97`	`QString m_check;`
`66`	`98`	`QString m_defaultvalue;`
`67`		`- QString m_foreignKey; // Even though this information is a table constraint easier for accessing and processing to store it here`
	`99`	`+ ForeignKeyClause m_foreignKey; // Even though this information is a table constraint it's easier for accessing and processing to store it here`
`68`	`100`	`bool m_autoincrement; //! this is stored here for simplification`
`69`	`101`	`bool m_primaryKey;`
`70`	`102`	`bool m_unique;`

Collapse file

`‎src/tests/testsqlobjects.cpp‎`

Copy file name to clipboardExpand all lines: src/tests/testsqlobjects.cpp

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,12 @@ void TestTable::foreignKeys()`
`82`	`82`	`{`
`83`	`83`	`Table tt("testtable");`
`84`	`84`	`FieldPtr f = FieldPtr(new Field("a", "integer"));`
`85`		`- f->setForeignKey("b(c)");`
	`85`	`+ f->setForeignKey(sqlb::ForeignKeyClause("b", QStringList("c")));`
`86`	`86`	`tt.addField(f);`
`87`	`87`
`88`	`88`	QCOMPARE(tt.sql(), QString("CREATE TABLE `testtable` (\n"
`89`	`89`	"\t`a`\tinteger,\n"
`90`		- "\tFOREIGN KEY(`a`) REFERENCES b(c)\n"
	`90`	+ "\tFOREIGN KEY(`a`) REFERENCES `b`(`c`)\n"
`91`	`91`	`");"));`
`92`	`92`	`}`
`93`	`93`
`@@ -241,17 +241,17 @@ void TestTable::parseSQLEscapedQuotes()`
`241`	`241`
`242`	`242`	`void TestTable::parseSQLForeignKeys()`
`243`	`243`	`{`
`244`		`- QString sql = "CREATE TABLE foreign_key_test(a int, b int, foreign key (a) references x, foreign key (b) references w(z) on delete set null);";`
	`244`	`+ QString sql = "CREATE TABLE foreign_key_test(a int, b int, foreign key (a) references x, foreign key (b) references w(y,z) on delete set null);";`
`245`	`245`
`246`	`246`	`Table tab = Table::parseSQL(sql).first;`
`247`	`247`
`248`	`248`	`QCOMPARE(tab.name(), QString("foreign_key_test"));`
`249`	`249`	`QCOMPARE(tab.fields().at(0)->name(), QString("a"));`
`250`	`250`	`QCOMPARE(tab.fields().at(0)->type(), QString("int"));`
`251`		`- QCOMPARE(tab.fields().at(0)->foreignKey(), QString("x"));`
	`251`	`+ QCOMPARE(tab.fields().at(0)->foreignKey().table(), QString("x"));`
`252`	`252`	`QCOMPARE(tab.fields().at(1)->name(), QString("b"));`
`253`	`253`	`QCOMPARE(tab.fields().at(1)->type(), QString("int"));`
`254`		`- QCOMPARE(tab.fields().at(1)->foreignKey(), QString("w ( z ) on delete set null"));`
	`254`	+ QCOMPARE(tab.fields().at(1)->foreignKey().toString(), QString("`w`(`y`,`z`) on delete set null"));
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`void TestTable::parseSQLCheckConstraint()`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.