Skip to content

Commit 1afbde4

Browse files
authored
Fix consecutive spacing (#481)
* Fix consecutive spacing * . * Fixup * cargo fmt * refactoring
1 parent ce9aa89 commit 1afbde4

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/backend/mysql/index.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ impl IndexBuilder for MysqlQueryBuilder {
77
sql: &mut dyn SqlWriter,
88
) {
99
self.prepare_index_prefix(create, sql);
10-
write!(sql, " KEY ").unwrap();
10+
write!(sql, "KEY ").unwrap();
1111

1212
if let Some(name) = &create.index.name {
1313
write!(sql, "{}{}{} ", self.quote(), name, self.quote()).unwrap();
@@ -28,12 +28,7 @@ impl IndexBuilder for MysqlQueryBuilder {
2828
) {
2929
write!(sql, "CREATE ").unwrap();
3030
self.prepare_index_prefix(create, sql);
31-
if create.unique || create.primary || matches!(create.index_type, Some(IndexType::FullText))
32-
{
33-
write!(sql, " INDEX ").unwrap();
34-
} else {
35-
write!(sql, "INDEX ").unwrap();
36-
}
31+
write!(sql, "INDEX ").unwrap();
3732

3833
if let Some(name) = &create.index.name {
3934
write!(sql, "{}{}{}", self.quote(), name, self.quote()).unwrap();
@@ -87,13 +82,13 @@ impl IndexBuilder for MysqlQueryBuilder {
8782

8883
fn prepare_index_prefix(&self, create: &IndexCreateStatement, sql: &mut dyn SqlWriter) {
8984
if create.primary {
90-
write!(sql, "PRIMARY").unwrap();
85+
write!(sql, "PRIMARY ").unwrap();
9186
}
9287
if create.unique {
93-
write!(sql, "UNIQUE").unwrap();
88+
write!(sql, "UNIQUE ").unwrap();
9489
}
9590
if matches!(create.index_type, Some(IndexType::FullText)) {
96-
write!(sql, "FULLTEXT").unwrap();
91+
write!(sql, "FULLTEXT ").unwrap();
9792
}
9893
}
9994
}

tests/mysql/table.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,17 @@ fn create_8() {
208208
);
209209
}
210210

211+
#[test]
212+
fn create_9() {
213+
assert_eq!(
214+
Table::create()
215+
.table(Glyph::Table)
216+
.index(Index::create().name("idx-glyph-id").col(Glyph::Id))
217+
.to_string(MysqlQueryBuilder),
218+
"CREATE TABLE `glyph` ( KEY `idx-glyph-id` (`id`) )"
219+
);
220+
}
221+
211222
#[test]
212223
fn drop_1() {
213224
assert_eq!(

0 commit comments

Comments
 (0)