Changeset: b5e8fd5bfc86 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5e8fd5bfc86 Modified Files: clients/ChangeLog clients/ruby/examples/xquery.rb clients/ruby/lib/MonetDB.rb clients/ruby/lib/MonetDBConnection.rb clients/ruby/lib/MonetDBData.rb clients/ruby/ruby-monetdb-sql-0.1.gemspec Branch: default Log Message:
ruby: drop xquery support diffs (115 lines): diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Mon Feb 7 2011 Fabian Groffen <[email protected]> +- Remove XQuery related code from Ruby adapter + * Thu Feb 3 2011 Fabian Groffen <[email protected]> - Make SQL the default language for mclient, e.g. to use when --language= or -l is omitted diff --git a/clients/ruby/examples/xquery.rb b/clients/ruby/examples/xquery.rb deleted file mode 100644 --- a/clients/ruby/examples/xquery.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'MonetDB' - -db = MonetDB.new - -db.connect(user = "monetdb", passwd = "monetdb", lang = "xquery", host="localhost", port = 50000, db_name = "ruby", auth_type = "SHA1") - -res = db.query('1 to 4,"aap",1.0,attribute { "aap" } { "beer" },<aap/>') - -while row = res.fetch do - printf "%s \n", row -end - -res.free diff --git a/clients/ruby/lib/MonetDB.rb b/clients/ruby/lib/MonetDB.rb --- a/clients/ruby/lib/MonetDB.rb +++ b/clients/ruby/lib/MonetDB.rb @@ -224,7 +224,7 @@ # Establish a new connection using named parameters. # * user: username (default is monetdb) # * passwd: password (default is monetdb) - # * language: {sql, xquery} (default is sql) + # * language: lang (default is sql) # * host: host to connect to (default is localhost) # * port: port to connect to (default is 50000) # * database: name of the database to connect to diff --git a/clients/ruby/lib/MonetDBConnection.rb b/clients/ruby/lib/MonetDBConnection.rb --- a/clients/ruby/lib/MonetDBConnection.rb +++ b/clients/ruby/lib/MonetDBConnection.rb @@ -48,10 +48,6 @@ LANG_SQL = "sql" -# Xquery support -LANG_XQUERY = "xquery" -XQUERY_OUTPUT_SEQ = true # use monetdb xquery's output seq - # Protocols MAPIv8 = 8 MAPIv9 = 9 @@ -120,9 +116,6 @@ if @lang == LANG_SQL set_timezone set_reply_size - elsif (@lang == LANG_XQUERY) and XQUERY_OUTPUT_SEQ - # require xquery output to be in seq format - send(format_command("output seq")) end true end diff --git a/clients/ruby/lib/MonetDBData.rb b/clients/ruby/lib/MonetDBData.rb --- a/clients/ruby/lib/MonetDBData.rb +++ b/clients/ruby/lib/MonetDBData.rb @@ -56,7 +56,7 @@ record_set = "" # temporarly store retrieved rows record_set = receive_record_set(data) - if (@lang == LANG_SQL) or (@lang == LANG_XQUERY and XQUERY_OUTPUT_SEQ) + if (@lang == LANG_SQL) rows = receive_record_set(data) # the fired query is a SELECT; store and return the whole record set if @action == Q_TABLE @@ -80,8 +80,6 @@ if @record_set.length != @query['rows'].to_i raise MonetDBQueryError, "Warning: Query #{@query['id']} declared to result in #{@query['rows']} but #{@record_set.length} returned instead" end - elsif (@lang == XQUERY and ! XQUERY_OUTPUT_SEQ) - return data # return an xml file end @record_set.freeze end @@ -242,10 +240,8 @@ # Formats a query <i>string</i> so that it can be parsed by the server def format_query(q) - if @lang.downcase == LANG_SQL + if @lang == LANG_SQL return "s" + q + ";" - elsif @lang.downcase == LANG_XQUERY - return "s" + q else raise LanguageNotSupported, @lang end diff --git a/clients/ruby/ruby-monetdb-sql-0.1.gemspec b/clients/ruby/ruby-monetdb-sql-0.1.gemspec --- a/clients/ruby/ruby-monetdb-sql-0.1.gemspec +++ b/clients/ruby/ruby-monetdb-sql-0.1.gemspec @@ -6,9 +6,9 @@ s.date = %q{2009-04-27} s.authors = ["G Modena"] s.email = %q{[email protected]} - s.summary = %q{Pure Ruby database driver for monetdb5/sql} + s.summary = %q{Pure Ruby database driver for MonetDB/SQL} s.homepage = %q{http://monetdb.cwi.nl/} - s.description = %q{Pure Ruby database driver for monetdb5/sql} + s.description = %q{Pure Ruby database driver for the MonetDB/SQL columnar database management system} s.files = ["README", "lib/MonetDB.rb", "lib/MonetDBConnection.rb", "lib/MonetDBData.rb", "lib/MonetDBExceptions.rb", "lib/hasher.rb"] s.has_rdoc = true s.require_path = './lib' _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
