Skip to content

Fix naming scheme for indexes to avoid conflicts #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amyfaithho wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix naming scheme for indexes to avoid conflicts #26

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbda4be
Fix naming scheme for indexes to avoid conflicts
amyfaithho Jul 24, 2022
93bb3c1
fix regex definition for floatTest
amyfaithho Aug 12, 2022
b929ecd
improved definition for float and int in regex
amyfaithho Aug 12, 2022
0a85403
Fix mispelled counted key for INTEGER
lukavia Jul 20, 2019
af020ce
Update to prefer STRING if one is found in the column
lukavia Jul 20, 2019
97c0211
Do not index TEXT
lukavia Jul 20, 2019
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
15 changes: 10 additions & 5 deletions lib/guess-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ function guessModel(data, tablesOptions = {}, sequlizeInstance) {
fields[fieldName] = field;

// Make indexes based on column name
if (shouldIndex(columnName, tablesOptions)) {
if (shouldIndex(columnName, tablesOptions) && field.type != 'TEXT') {
// Index needs to use SQL name, not Sequelize name
modelOptions.indexes.push({ fields: [sqlName] });
// By default index name will be [table]_[fields]
modelOptions.indexes.push({ name: `ix_${sqlName}`, fields: [sqlName] });
}
});

Expand Down Expand Up @@ -142,8 +143,12 @@ function dataToType(data, name, tablesOptions = {}) {
else if (_.size(counted) === 1) {
kind = top.kind;
}
// If there is a string, use string
else if (counted.STRING) {
kind = 'STRING';
}
// If there is an integer and a float, use float
else if (counted.INTGER && counted.FLOAT) {
else if (counted.INTEGER && counted.FLOAT) {
kind = 'FLOAT';
}
else {
Expand Down Expand Up @@ -193,8 +198,8 @@ function shouldIndex(name, options = {}) {
// Find type. Should return base Sequelize type
function pickle(value, options = {}) {
// Tests
let floatTest = /^-?[\d,]+.\d+$/g;
let intTest = /^-?[\d,]+$/g;
let floatTest = /^[-+]?(\d{1,3}(,\d{3})*|\d+)\.\d+$/g;
let intTest = /^[-+]?(\d{1,3}(,\d{3})*|\d+)$/g;
let booleanTest = /^(true|false|y|n|yes|no)$/gi;
let dateTest = /^\d{1,2}\/\d{1,2}\/\d{2,4}$/g;
let datetimeTest = /^\d{1,2}\/\d{1,2}\/\d{2,4}\s+\d{1,2}:\d{1,2}(:\d{1,2}|)(\s+|)(am|pm|)$/gi;
Expand Down