Bugzilla – Attachment 147672 Details for
Bug 32613
Add auto-completion to our SQL reports editor
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32613: Add database tables to autocomplete
Bug-32613-Add-database-tables-to-autocomplete.patch (text/plain), 38.97 KB, created by
Jacob O'Mara
on 2023-03-02 21:13:28 UTC
(
hide
)
Description:
Bug 32613: Add database tables to autocomplete
Filename:
MIME Type:
Creator:
Jacob O'Mara
Created:
2023-03-02 21:13:28 UTC
Size:
38.97 KB
patch
obsolete
>From 25542fd6c624a51b6e4d6eba788ae7dbc52727a3 Mon Sep 17 00:00:00 2001 >From: Jacob O'Mara <jacob.omara@ptfs-europe.com> >Date: Wed, 1 Mar 2023 11:02:34 +0000 >Subject: [PATCH] Bug 32613: Add database tables to autocomplete > >This patch adds a database call to get the table and column names in the >database and parse them into the autocomplete engine. > >Test Plan: >As previous commit but also check for column/table names in the >autocomplete popup >--- > koha-tmpl/intranet-tmpl/lib/codemirror/sql.js | 135 +++++++++++++++++- > .../modules/reports/guided_reports_start.tt | 3 + > reports/guided_reports.pl | 33 ++++- > 3 files changed, 165 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/lib/codemirror/sql.js b/koha-tmpl/intranet-tmpl/lib/codemirror/sql.js >index 02f5e06015a..4f6405dc702 100644 >--- a/koha-tmpl/intranet-tmpl/lib/codemirror/sql.js >+++ b/koha-tmpl/intranet-tmpl/lib/codemirror/sql.js >@@ -314,7 +314,140 @@ CodeMirror.defineMode("sql", function(config, parserConfig) { > CodeMirror.defineMIME("text/x-mysql", { > name: "sql", > client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"), >- keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"), >+ keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"), >+ builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"), >+ atoms: set("false true null unknown"), >+ operatorChars: /^[*+\-%<>!=&|^]/, >+ dateSQL: set("date time timestamp"), >+ support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"), >+ hooks: { >+ "@": hookVar, >+ "`": hookIdentifier, >+ "\\": hookClient >+ } >+ }); >+ >+ CodeMirror.defineMIME("text/x-mariadb", { >+ name: "sql", >+ client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"), >+ keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"), >+ builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"), >+ atoms: set("false true null unknown"), >+ operatorChars: /^[*+\-%<>!=&|^]/, >+ dateSQL: set("date time timestamp"), >+ support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"), >+ hooks: { >+ "@": hookVar, >+ "`": hookIdentifier, >+ "\\": hookClient >+ } >+ }); >+ >+ // provided by the phpLiteAdmin project - phpliteadmin.org >+ CodeMirror.defineMIME("text/x-sqlite", { >+ name: "sql", >+ // commands of the official SQLite client, ref: https://www.sqlite.org/cli.html#dotcmd >+ client: set("auth backup bail binary changes check clone databases dbinfo dump echo eqp exit explain fullschema headers help import imposter indexes iotrace limit lint load log mode nullvalue once open output print prompt quit read restore save scanstats schema separator session shell stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width"), >+ // ref: http://sqlite.org/lang_keywords.html >+ keywords: set(sqlKeywords + "abort action add after all analyze attach autoincrement before begin cascade case cast check collate column commit conflict constraint cross current_date current_time current_timestamp database default deferrable deferred detach each else end escape except exclusive exists explain fail for foreign full glob if ignore immediate index indexed initially inner instead intersect isnull key left limit match natural no notnull null of offset outer plan pragma primary query raise recursive references regexp reindex release rename replace restrict right rollback row savepoint temp temporary then to transaction trigger unique using vacuum view virtual when with without"), >+ // SQLite is weakly typed, ref: http://sqlite.org/datatype3.html. This is just a list of some common types. >+ builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text clob bigint int int2 int8 integer float double char varchar date datetime year unsigned signed numeric real"), >+ // ref: http://sqlite.org/syntax/literal-value.html >+ atoms: set("null current_date current_time current_timestamp"), >+ // ref: http://sqlite.org/lang_expr.html#binaryops >+ operatorChars: /^[*+\-%<>!=&|/~]/, >+ // SQLite is weakly typed, ref: http://sqlite.org/datatype3.html. This is just a list of some common types. >+ dateSQL: set("date time timestamp datetime"), >+ support: set("decimallessFloat zerolessFloat"), >+ identifierQuote: "\"", //ref: http://sqlite.org/lang_keywords.html >+ hooks: { >+ // bind-parameters ref:http://sqlite.org/lang_expr.html#varparam >+ "@": hookVar, >+ ":": hookVar, >+ "?": hookVar, >+ "$": hookVar, >+ // The preferred way to escape Identifiers is using double quotes, ref: http://sqlite.org/lang_keywords.html >+ "\"": hookIdentifierDoublequote, >+ // there is also support for backtics, ref: http://sqlite.org/lang_keywords.html >+ "`": hookIdentifier >+ } >+ }); >+ >+ // the query language used by Apache Cassandra is called CQL, but this mime type >+ // is called Cassandra to avoid confusion with Contextual Query Language >+ CodeMirror.defineMIME("text/x-cassandra", { >+ name: "sql", >+ client: { }, >+ keywords: set("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count custom desc distinct each_quorum exists filtering from grant if in index into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged use user users using values where with writetime"), >+ builtin: set("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"), >+ atoms: set("false true infinity NaN"), >+ operatorChars: /^[<>=]/, >+ dateSQL: { }, >+ support: set("commentSlashSlash decimallessFloat"), >+ hooks: { } >+ }); >+ >+ // this is based on Peter Raganitsch's 'plsql' mode >+ CodeMirror.defineMIME("text/x-plsql", { >+ name: "sql", >+ client: set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"), >+ keywords: set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay desc digits dispose distinct do else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable use using validate value values variable view views when whenever where while with work"), >+ builtin: set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"), >+ operatorChars: /^[*+\-%<>!=~]/, >+ dateSQL: set("date time timestamp"), >+ support: set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber") >+ }); >+ >+ // Created to support specific hive keywords >+ CodeMirror.defineMIME("text/x-hive", { >+ name: "sql", >+ keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue cross cursor data database databases dbproperties deferred delimited desc describe directory disable distinct distribute else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock use using utc utc_tmestamp view when where while with"), >+ builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"), >+ atoms: set("false true null unknown"), >+ operatorChars: /^[*+\-%<>!=]/, >+ dateSQL: set("date timestamp"), >+ support: set("ODBCdotTable doubleQuote binaryNumber hexNumber") >+ }); >+ >+ CodeMirror.defineMIME("text/x-pgsql", { >+ name: "sql", >+ client: set("source"), >+ // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html >+ keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"), >+ // https://www.postgresql.org/docs/10/static/datatype.html >+ builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"), >+ atoms: set("false true null unknown"), >+ operatorChars: /^[*+\-%<>!=&|^\/#@?~]/, >+ dateSQL: set("date time timestamp"), >+ support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast") >+ }); >+ >+ // Google's SQL-like query language, GQL >+ CodeMirror.defineMIME("text/x-gql", { >+ name: "sql", >+ keywords: set("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"), >+ atoms: set("false true"), >+ builtin: set("blob datetime first key __key__ string integer double boolean null"), >+ operatorChars: /^[*+\-%<>!=]/ >+ }); >+ >+ // Greenplum >+ CodeMirror.defineMIME("text/x-gpsql", { >+ name: "sql", >+ client: set("source"), >+ //https://github.com/greenplum-db/gpdb/blob/master/src/include/parser/kwlist.h >+ keywords: set("abort absolute access action active add admin after aggregate all also alter always analyse analyze and any array as asc assertion assignment asymmetric at authorization backward before begin between bigint binary bit boolean both by cache called cascade cascaded case cast chain char character characteristics check checkpoint class close cluster coalesce codegen collate column comment commit committed concurrency concurrently configuration connection constraint constraints contains content continue conversion copy cost cpu_rate_limit createdb createexttable createrole createuser cross csv cube current current_catalog current_date current_role current_schema current_time current_timestamp current_user cursor cycle data database day deallocate dec decimal declare decode default defaults deferrable deferred definer delimiter delimiters deny desc dictionary disable discard distinct distributed do document domain double dxl each else enable encoding encrypted end enum errors escape every except exchange exclude excluding exclusive execute exists explain extension external extract false family fetch fields filespace fill filter first float following for force foreign format forward freeze from full function global grant granted greatest group group_id grouping handler hash having header hold host hour identity if ignore ilike immediate immutable implicit in including inclusive increment index indexes inherit inherits initially inline inner inout input insensitive instead int integer intersect interval into invoker is isnull isolation join key language large last leading least left level like limit list listen load local localtime localtimestamp location lock log login mapping master match maxvalue median merge minute minvalue missing mode modifies modify month move name names national natural nchar new newline next no nocreatedb nocreateexttable nocreaterole nocreateuser noinherit nologin none noovercommit nosuperuser not nothing notify notnull nowait null nullif nulls numeric object of off offset oids old on only operator option options or order ordered others out outer over overcommit overlaps overlay owned owner parser partial partition partitions passing password percent percentile_cont percentile_disc placing plans position preceding precision prepare prepared preserve primary prior privileges procedural procedure protocol queue quote randomly range read readable reads real reassign recheck recursive ref references reindex reject relative release rename repeatable replace replica reset resource restart restrict returning returns revoke right role rollback rollup rootpartition row rows rule savepoint scatter schema scroll search second security segment select sequence serializable session session_user set setof sets share similar simple smallint some split sql stable standalone start statement statistics stdin stdout storage strict strip subpartition subpartitions substring superuser symmetric sysid system table tablespace temp template temporary text then threshold ties time timestamp to trailing transaction treat trigger trim true truncate trusted type unbounded uncommitted unencrypted union unique unknown unlisten until user using vacuum valid validation validator value values varchar variadic varying verbose version view volatile web when where whitespace window with within without work writable write xml xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlparse xmlpi xmlroot xmlserialize year yes zone"), >+ builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"), >+ atoms: set("false true null unknown"), >+ operatorChars: /^[*+\-%<>!=&|^\/#@?~]/, >+ dateSQL: set("date time timestamp"), >+ support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast") >+ }); >+ >+ // Spark SQL >+ CodeMirror.defineMIME("text/x-sparksql", { >+ name: "sql", >+ keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost cross cube current current_date current_timestamp database databases datata dbproperties defined delimited deny desc describe dfs directories distinct distribute else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"), > builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"), > atoms: set("false true null"), > operatorChars: /^[*+\-%<>!=~&|^]/, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 79e5df8fd0a..0733fca6f47 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -1563,6 +1563,9 @@ > }, > extraKeys: {"Tab": "autocomplete"}, //enable tab to accept auto-complete > hint: CodeMirror.hint.sql, >+ hintOptions: { >+ tables: [% To.json(tables) | $raw %] >+ } > }); > var ExcludedTriggerKeys = { //key-code combinations of keys that will not fire the auto-complete script > "8": "backspace", >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index ab79b0f4638..fcd3cf22985 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -163,16 +163,16 @@ elsif ( $phase eq 'Delete Multiple') { > } > > elsif ( $phase eq 'Delete Saved') { >- >+ > # delete a report from the saved reports list > my $ids = $input->param('reports'); > delete_report($ids); > print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"); > exit; >-} >+} > > elsif ( $phase eq 'Show SQL'){ >- >+ > my $id = $input->param('reports'); > my $report = Koha::Reports->find($id); > $template->param( >@@ -192,6 +192,7 @@ elsif ( $phase eq 'Edit SQL'){ > my $report = Koha::Reports->find($id); > my $group = $report->report_group; > my $subgroup = $report->report_subgroup; >+ my $tables = get_tables(); > $template->param( > 'sql' => $report->savedsql, > 'reportname' => $report->report_name, >@@ -203,7 +204,8 @@ elsif ( $phase eq 'Edit SQL'){ > 'usecache' => $usecache, > 'editsql' => 1, > 'mana_id' => $report->{mana_id}, >- 'mana_comments' => $report->{comments} >+ 'mana_comments' => $report->{comments}, >+ 'tables' => $tables > ); > } > >@@ -219,6 +221,7 @@ elsif ( $phase eq 'Update SQL'){ > my $public = $input->param('public'); > my $save_anyway = $input->param('save_anyway'); > my @errors; >+ my $tables = get_tables(); > > # if we have the units, then we came from creating a report from SQL and thus need to handle converting units > if( $cache_expiry_units ){ >@@ -263,7 +266,7 @@ elsif ( $phase eq 'Update SQL'){ > 'public' => $public, > 'problematic_authvals' => $problematic_authvals, > 'warn_authval_problem' => 1, >- 'phase_update' => 1 >+ 'phase_update' => 1, > ); > > } else { >@@ -288,6 +291,7 @@ elsif ( $phase eq 'Update SQL'){ > 'cache_expiry' => $cache_expiry, > 'public' => $public, > 'usecache' => $usecache, >+ 'tables' => $tables > ); > logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog"); > } >@@ -556,6 +560,7 @@ elsif ( $phase eq 'Save Report' ) { > my $cache_expiry_units = $input->param('cache_expiry_units'); > my $public = $input->param('public'); > my $save_anyway = $input->param('save_anyway'); >+ my $tables = get_tables(); > > > # if we have the units, then we came from creating a report from SQL and thus need to handle converting units >@@ -640,6 +645,7 @@ elsif ( $phase eq 'Save Report' ) { > 'cache_expiry' => $cache_expiry, > 'public' => $public, > 'usecache' => $usecache, >+ 'tables' => $tables > ); > } > } >@@ -998,6 +1004,8 @@ elsif ( $phase eq 'Create report from SQL' || $phase eq 'Create report from exis > $notes = $report->notes // ''; > } > >+ my $tables = get_tables(); >+ > $template->param( > sql => $sql, > reportname => $reportname, >@@ -1007,6 +1015,7 @@ elsif ( $phase eq 'Create report from SQL' || $phase eq 'Create report from exis > 'public' => '0', > 'cache_expiry' => 300, > 'usecache' => $usecache, >+ 'tables' => $tables, > > ); > } >@@ -1024,6 +1033,20 @@ sub header_cell_loop { > return \@headers; > } > >+#get a list of available tables for auto-complete >+sub get_tables { >+ my $result = {}; >+ my $tables = C4::Reports::Guided->get_all_tables(); >+ for my $table (@{$tables}) { >+ my $sql = "SHOW COLUMNS FROM $table"; >+ my $rows = C4::Context->dbh->selectall_arrayref($sql, { Slice => {} }); >+ for my $row (@{$rows}) { >+ push @{$result->{$table}}, $row->{Field}; >+ } >+ } >+ return $result; >+} >+ > foreach (1..6) { > $template->{VARS}->{'build' . $_} and last; > } >-- >2.39.2
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=147672">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32613
:
147556
|
147557
|
147610
|
147611
|
147612
|
147660
|
147661
|
147672
|
147673
|
147674
|
147715
|
147716
|
147717
|
147795