lib/query.rb in active-orient-0.4 vs lib/query.rb in active-orient-0.5

@@ -1,88 +1,86 @@
+module ActiveOrient # :nodoc: 
 
-module ActiveOrient 
-class Query < ActiveOrient::Model
+## this is depreciated and not maintained anymore
+  class Query < ActiveOrient::Model
 
-   has_many :records
-   has_many :queries
+    has_many :records
+    has_many :queries
 
-   def reset_records
-     self.records= []
-   end
-   alias reset_results reset_records
+    def reset_records
+      self.records= []
+    end
+    alias reset_results reset_records
 
-   def reset_queries
-     self.queries = []
-   end
+    def reset_queries
+      self.queries = []
+    end
+
 =begin
-calls ActiveOrient::ActiveOrient#GetDocuments
-stores the query in the query-stack and saves the result in the record-Array
+  Calls ActiveOrient::ActiveOrient#GetRecords
+  Stores the query in the query-stack and saves the result in the record-Array
 
-returns the count of assigned records
+  Returns the count of assigned records
 =end
 
-   def get_documents o_class , **args  
+    def get_records o_class , **args
+      query = OrientSupport::OrientQuery.new classname(o_class), args
+	    self.queries << query.compose
+      count = 0
+      orientdb.get_records(o_class, query: query.compose).each{|c| records << c; count += 1}
+      count
+    end
+    alias get_documents get_records
 
-	query = OrientSupport::OrientQuery.new class_name(o_class), args
-	self.queries << query.compose 
-       count= 0
-       orientdb.get_documents( o_class , query: query.compose ).each{|c| records << c; count+=1 }
-       count
-   end
-
 =begin
-All predefined queries are send to the database.
-The result is stored in the records.
-Unknown Records are of Type ActiveOrient::Model::Myquery, uses ActiveOrient::Orientdb.execute which tries to autosuggest the ActiveOrient::Model::{Class}
+  All predefined queries are send to the database.
+  The result is stored in the records.
+  Unknown Records are of Type ActiveOrient::Model::Myquery, uses ActiveOrient::Orientdb.execute which tries to autosuggest the ActiveOrient::Model::{Class}
 
-example: Multible Records
-ach = ActiveOrient::Query.new
-ach.queries << 'create class Contracts ABSTRACT'
-ach.queries << 'create property Contracts.details link'
-ach.queries << 'create class Stocks extends Contracts'
-result = ach.execute_queries transaction: false
+  example: Multible Records
+    ach = ActiveOrient::Query.new
+    ach.queries << 'create class Contracts ABSTRACT'
+    ach.queries << 'create property Contracts.details link'
+    ach.queries << 'create class Stocks extends Contracts'
+    result = ach.execute_queries transaction: false
 
-example: Batch
-q = ActiveOrient::Query.new
-q.queries << [
-      "select expand( contracts )  from Openinterest"
-       "let con = select expand( contracts )  from Openinterest; ",
-       "let sub = select from Subcategories where contracts in $con;",
-       "let cat = select from Categories where subcategories in $sub;",
-       "let ind = select from Industries where categories in $cat;",
-       "SELECT expand(unionall) FROM (SELECT unionall( $con, $cat))"
-              ]
-q.execute_queries.each{|x|  puts "X #{x.inspect}" }
-
+  example: Batch
+    q = ActiveOrient::Query.new
+    q.queries << [
+    "select expand( contracts ) from Openinterest"
+    "let con = select expand( contracts ) from Openinterest;",
+    "let sub = select from Subcategories where contracts in $con;",
+    "let cat = select from Categories where subcategories in $sub;",
+    "let ind = select from Industries where categories in $cat;",
+    "SELECT expand(unionall) FROM (SELECT unionall( $con, $cat))"
+    ]
+    q.execute_queries.each{|x| puts "X #{x.inspect}" }
 =end
-   def execute_queries reset: true, transaction: true
-     reset_records if reset
-     begin 
-     orientdb.execute( transaction: transaction ) do 
-     result = queries.map do |q|
-       # command: words are seperated by one space only, thus squeeze multible spaces
-       sql_cmd = -> (command) { { type: "cmd", language: "sql", command: command.squeeze(' ') } }
-       batch_cmd = ->( command_array ){ {type: "script", language: "sql", script: command_array } }
-       case q
-       when String
-	 sql_cmd[ q ]
-       when Hash
-	 q
-       when Array
-	 batch_cmd[ q ]
-	else
-	  nil
-       end # case
-     end.compact 
-     # save the result in records
-     result.each{|y| records << y  }
 
-     end # block
-     rescue RestClient::InternalServerError => e
-       puts e.inspect
-     end
-
-   end # def  execute_queries
-
-end # class
-
+    def execute_queries reset: true, transaction: true
+      reset_records if reset
+      begin
+        orientdb.execute( transaction: transaction ) do
+          result = queries.map do |q|
+# command: words are seperated by one space only, thus squeeze multible spaces
+            sql_cmd = -> (command) {{type: "cmd", language: "sql", command: command.squeeze(' ') }}
+            batch_cmd = -> (command_array){{type: "script", language: "sql", script: command_array}}
+            case q
+            when String
+	            sql_cmd[q]
+            when Hash
+	            q
+            when Array
+	            batch_cmd[q]
+	          else
+	            nil
+            end # case
+          end.compact
+     # save the result in records
+          result.each{|y| records << y}
+        end # block
+      rescue RestClient::InternalServerError => e
+        puts e.inspect
+      end
+    end # def  execute_queries
+  end # class
 end # module