verdnatura-mirror
/
loopback-connector-mysql
mirror of https://github.com/loopbackio/loopback-connector-mysql.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return if column is generated or not 

Related to
https://github.com/strongloop/loopback-datasource-juggler/issues/899
This commit is contained in:
Christiaan Westerbeek 2016-09-28 16:13:34 +02:00 committed by biniam
parent 0fe22653e3
commit dd91b16e60
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/discovery.js
View File

@ -204,7 +204,8 @@ function mixinDiscovery(MySQL, mysql) {
' numeric_precision AS "dataPrecision",' + ' numeric_precision AS "dataPrecision",' +
' numeric_scale AS "dataScale",' + ' numeric_scale AS "dataScale",' +
' column_type AS "columnType",' + ' column_type AS "columnType",' +
' is_nullable = \'YES\' AS "nullable"' + ' is_nullable = \'YES\' AS "nullable",' +
' CASE WHEN extra LIKE \'%auto_increment%\' THEN 1 ELSE 0 END AS generated'
' FROM information_schema.columns' + ' FROM information_schema.columns' +
' WHERE table_schema=' + mysql.escape(schema) + ' WHERE table_schema=' + mysql.escape(schema) +
(table ? ' AND table_name=' + mysql.escape(table) : ''), (table ? ' AND table_name=' + mysql.escape(table) : ''),
@ -217,8 +218,13 @@ function mixinDiscovery(MySQL, mysql) {
' character_maximum_length AS "dataLength",' + ' character_maximum_length AS "dataLength",' +
' numeric_precision AS "dataPrecision",' + ' numeric_precision AS "dataPrecision",' +
' numeric_scale AS "dataScale",' + ' numeric_scale AS "dataScale",' +
<<<<<<< HEAD
' column_type AS "columnType",' + ' column_type AS "columnType",' +
' is_nullable = \'YES\' AS "nullable"' + ' is_nullable = \'YES\' AS "nullable"' +
=======
' is_nullable = \'YES\' AS "nullable",' +
' CASE WHEN extra LIKE \'%auto_increment%\' THEN 1 ELSE 0 END AS generated'
>>>>>>> b73fd1e... Return if column is generated or not
' FROM information_schema.columns' + ' FROM information_schema.columns' +
(table ? ' WHERE table_name=' + mysql.escape(table) : ''), (table ? ' WHERE table_name=' + mysql.escape(table) : ''),
'table_name, ordinal_position', {}); 'table_name, ordinal_position', {});