gda 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249c2a0b4052ce8966703bb9e64523efdcc6efb8fa811e2ec615673d95e40c28
-  data.tar.gz: 19e8a69b6aeda5bceac5b682329ada312d25133fcb9ac42ab98396239420768c
+  metadata.gz: c3d2ee26e57caf91e7aca441c227da8bb08151832e2204657919e9d1b460779f
+  data.tar.gz: e1fa55cfef56159e03af7fe8a98fd6d18471956a3b63e15b1120eb8c816227a0
 SHA512:
-  metadata.gz: 42f1ec2a4b005c76434ac414cdc3845d7fa0133490fc0bd13d092f258b67c55cecf4d00279f3f16207383f1d62f4971a6f7b05fe1c59ba32b4df10ca327db548
-  data.tar.gz: 4ea782a5e30f0996617387dc2d706cf8cb77154162055f6bad58a4bc93c2e77d0176a018c0e8155a9163e5d1caf11f975c9bfbd9d7e29192c87757657397532c
+  metadata.gz: 91516f5fee707e47dbc2954cf5a5f26f02069f234449bef6265010f01ecc411d6d2c2ad18c6d1f3e9299ae073899bc8a87a3470163d2060f78568e2285b998ce
+  data.tar.gz: e495e7841c2931c45b825ba5aa11821f68ca843e11f309678c07f23e4591bd0067800f1efdd39606dfd49adcde6b35c5cc27083459b8f2cba78025c82d8098c4

data/README.md

@@ -1,40 +1,44 @@
-= gda
+# gda
 
 * http://github.com/tenderlove/gda
 
-== DESCRIPTION:
+## DESCRIPTION:
 
 An SQL parser. Wraps libgda in a loving embrace to give you a ruby level SQL
 parser.
 
-== SYNOPSIS:
+## SYNOPSIS:
 
-  parser = GDA::SQL::Parser.new
+```ruby
+parser = GDA::SQL::Parser.new
 
-  stmt = parser.parse 'SELECT * FROM FOO WHERE 1 = 1 GROUP BY omg HAVING omg(id) < 2 ORDER BY foo, bar LIMIT 50 OFFSET 2'
+stmt = parser.parse 'SELECT * FROM FOO WHERE 1 = 1 GROUP BY omg HAVING omg(id) < 2 ORDER BY foo, bar LIMIT 50 OFFSET 2'
 
-  stmt.ast.each do |node|
-    p node
-  end
+stmt.ast.each do |node|
+  p node
+end
 
-  puts stmt.ast.to_dot
+puts stmt.ast.to_dot
+```
 
-== HACKING:
+## HACKING
 
     $ brew install libgda
     $ gem install hoe rake-compiler
     $ rake
 
-== INSTALL:
 
-* brew install libgda
-* gem install gda
+## INSTALL
 
-== LICENSE:
+
+    $ brew install libgda
+    $ gem install gda
+
+## LICENSE
 
 (The MIT License)
 
-Copyright (c) 2012-2016 Aaron Patterson
+Copyright (c) 2012-2023 Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/ext/gda/extconf.rb

@@ -7,17 +7,21 @@ ENV['PKG_CONFIG_PATH'] ||= '/usr/local/lib/pkgconfig'
 dir_config 'libgda'
 
 def asplode missing
-  abort <<-MSG
-#{missing} is missing. Try 'brew install libgda' if you are on OSX and have homebrew installed.
-You can also check https://github.com/GNOME/libgda for more info on how to install
-the dependency.
-MSG
+  abort <<~MSG
+    #{missing} is missing. Try 'brew install pkg-config libgda' if you are on OSX and have homebrew installed.
+    You can also check https://github.com/GNOME/libgda for more info on how to install
+    the dependency.
+  MSG
 end
 
-pkg_config 'libgda-5.0'
-find_header('libgda/sql-parser/gda-sql-parser.h') || asplode("libgda")
+available_libgda_pkg_config = nil
+%w(5.0 6.0).each do |pkg_config_version|
+  pkg_config "libgda-#{pkg_config_version}"
+  available_libgda_pkg_config = find_header('libgda/sql-parser/gda-sql-parser.h')
+  break if available_libgda_pkg_config
+end
 
+asplode("libgda") unless available_libgda_pkg_config
 create_makefile 'gda'
 
-
 # :startdoc:

data/ext/gda/gda.c

@@ -4,12 +4,65 @@ VALUE mGDA;
 VALUE mSQL;
 VALUE cParser;
 
+static void parser_free(void *data)
+{
+    g_object_unref((GdaSqlParser *)data);
+}
+
+static size_t parser_memsize(const void *data)
+{
+    return sizeof(GdaSqlParser);
+}
+
+static const rb_data_type_t parser_type = {
+  "GDA::SQL::Parser",
+  {
+      NULL,
+      parser_free,
+      parser_memsize,
+  },
+  0,
+  0,
+  RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
+VALUE gda_parser_wrap(VALUE klass, GdaSqlParser * parser)
+{
+    return TypedData_Wrap_Struct(klass, &parser_type, parser);
+}
+
 static VALUE allocate(VALUE klass)
 {
-    GdaSqlParser * parser;
+    return gda_parser_wrap(klass, gda_sql_parser_new());
+}
 
-    parser = gda_sql_parser_new();
-    return Data_Wrap_Struct(klass, NULL, g_object_unref, parser);
+static void statement_free(void *data)
+{
+    g_object_unref((GdaStatement *)data);
+}
+
+static size_t statement_memsize(const void *data)
+{
+    return sizeof(GdaStatement);
+}
+
+static const rb_data_type_t statement_type = {
+  "GDA::SQL::Statement",
+  {
+      NULL,
+      statement_free,
+      statement_memsize,
+  },
+  0,
+  0,
+  RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
+GdaStatement *gda_statement_unwrap(VALUE self)
+{
+    GdaStatement * stmt;
+    TypedData_Get_Struct(self, GdaStatement, &statement_type, stmt);
+    return stmt;
 }
 
 static VALUE parse(VALUE self, VALUE sql)
@@ -19,7 +72,7 @@ static VALUE parse(VALUE self, VALUE sql)
     GError * error = NULL;
     const gchar * rest;
 
-    Data_Get_Struct(self, GdaSqlParser, parser);
+    TypedData_Get_Struct(self, GdaSqlParser, &parser_type, parser);
 
     stmt = gda_sql_parser_parse_string(parser, StringValuePtr(sql), &rest, &error);
 
@@ -27,7 +80,7 @@ static VALUE parse(VALUE self, VALUE sql)
 	rb_raise(rb_eRuntimeError, "error parsing sql");
     }
 
-    return Data_Wrap_Struct(cStatement, NULL, g_object_unref, stmt);
+    return TypedData_Wrap_Struct(cStatement, &statement_type, stmt);
 }
 
 static VALUE providers(VALUE klass)
@@ -75,15 +128,19 @@ static VALUE sql_identifier_split(VALUE klass, VALUE string)
     return ids;
 }
 
-void Init_gda()
+void Init_gda(void)
 {
-
+    rb_global_variable(&mGDA);
     mGDA = rb_define_module("GDA");
+
+    rb_global_variable(&mSQL);
     mSQL = rb_define_module_under(mGDA, "SQL");
 
     Init_gda_statement();
     Init_gda_nodes();
     Init_gda_provider();
+
+    rb_global_variable(&cParser);
     cParser = rb_define_class_under(mSQL, "Parser", rb_cObject);
 
     rb_define_alloc_func(cParser, allocate);

data/ext/gda/gda.h

@@ -11,6 +11,9 @@ extern VALUE mSQL;
 extern VALUE cStatement;
 extern VALUE cParser;
 
+GdaStatement *gda_statement_unwrap(VALUE stmt);
+VALUE gda_parser_wrap(VALUE klass, GdaSqlParser * parser);
+
 #include <gda_statement.h>
 #include <gda_nodes.h>
 #include <gda_provider.h>

data/ext/gda/gda_nodes.c

@@ -25,11 +25,23 @@ VALUE cRollback;
 VALUE cCommit;
 VALUE cCompound;
 
+static const rb_data_type_t any_part_type = {
+    "GDA::SQL::AnyPart",
+    {
+        NULL,
+        NULL,
+        NULL,
+    },
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 #define WrapInteger(klass, type, lname) \
     static VALUE rb_##klass##_##lname(VALUE self) \
 { \
     type *st;\
-    Data_Get_Struct(self, type, st); \
+    TypedData_Get_Struct(self, type, &any_part_type, st); \
     return INT2NUM(st->lname); \
 }
 
@@ -37,7 +49,7 @@ VALUE cCompound;
     static VALUE rb_##klass##_##lname(VALUE self) \
 { \
     type *st;\
-    Data_Get_Struct(self, type, st); \
+    TypedData_Get_Struct(self, type, &any_part_type, st); \
     if (st->lname) \
       return Qtrue; \
     else \
@@ -48,7 +60,7 @@ VALUE cCompound;
     static VALUE rb_##klass##_##lname(VALUE self) \
 { \
     type *st;\
-    Data_Get_Struct(self, type, st); \
+    TypedData_Get_Struct(self, type, &any_part_type, st); \
     if (st->lname) \
       return rb_str_new2(st->lname); \
     else \
@@ -60,7 +72,7 @@ VALUE cCompound;
 { \
     type *st;\
     VALUE stmt;\
-    Data_Get_Struct(self, type, st); \
+    TypedData_Get_Struct(self, type, &any_part_type, st); \
     stmt = rb_iv_get(self, "stmt"); \
     return WrapAnyPart(stmt, (GdaSqlAnyPart *)st->lname); \
 }
@@ -72,7 +84,7 @@ VALUE cCompound;
     GSList *list; \
     VALUE rb_list; \
     VALUE stmt; \
-    Data_Get_Struct(self, type, ptr);\
+    TypedData_Get_Struct(self, type, &any_part_type, ptr);\
     stmt = rb_iv_get(self, "stmt"); \
     rb_list = rb_ary_new(); \
     list = ptr->lname; \
@@ -155,7 +167,7 @@ static VALUE distinct_p(VALUE self)
 {
     GdaSqlStatementSelect * st;
 
-    Data_Get_Struct(self, GdaSqlStatementSelect, st);
+    TypedData_Get_Struct(self, GdaSqlStatementSelect, &any_part_type, st);
 
     if (st->distinct)
 	return Qtrue;
@@ -165,7 +177,7 @@ static VALUE distinct_p(VALUE self)
 
 static VALUE Wrap(VALUE stmt, VALUE klass, GdaSqlAnyPart *part)
 {
-    VALUE obj = Data_Wrap_Struct(klass, NULL, NULL, part);
+    VALUE obj = TypedData_Wrap_Struct(klass, &any_part_type, part);
     rb_iv_set(obj, "stmt", stmt);
     return obj;
 }
@@ -256,7 +268,7 @@ static VALUE rb_cCompound_stmt_list(VALUE self)
     VALUE array;
     VALUE stmt;
 
-    Data_Get_Struct(self, GdaSqlStatementCompound, st);
+    TypedData_Get_Struct(self, GdaSqlStatementCompound, &any_part_type, st);
     stmt = rb_iv_get(self, "stmt");
     array = rb_ary_new();
 
@@ -276,7 +288,7 @@ static VALUE rb_cInsert_values_list(VALUE self)
     VALUE array;
     VALUE stmt;
 
-    Data_Get_Struct(self, GdaSqlStatementInsert, st);
+    TypedData_Get_Struct(self, GdaSqlStatementInsert, &any_part_type, st);
 
     stmt = rb_iv_get(self, "stmt");
 
@@ -302,7 +314,7 @@ static VALUE rb_cOperation_operator(VALUE self)
 {
     GdaSqlOperation * st;
 
-    Data_Get_Struct(self, GdaSqlOperation, st);
+    TypedData_Get_Struct(self, GdaSqlOperation, &any_part_type, st);
 
     if (st->operator_type)
 	return rb_str_new2(gda_sql_operation_operator_to_string(st->operator_type));
@@ -314,7 +326,7 @@ static VALUE rb_cJoin_join_type(VALUE self)
 {
     GdaSqlSelectJoin * st;
 
-    Data_Get_Struct(self, GdaSqlSelectJoin, st);
+    TypedData_Get_Struct(self, GdaSqlSelectJoin, &any_part_type, st);
 
     if (st->type)
 	return rb_str_new2(gda_sql_select_join_type_to_string(st->type));
@@ -326,7 +338,7 @@ static VALUE rb_st_type(VALUE self)
 {
     GdaSqlAnyPart * st;
 
-    Data_Get_Struct(self, GdaSqlAnyPart, st);
+    TypedData_Get_Struct(self, GdaSqlAnyPart, &any_part_type, st);
 
     switch(st->type) {
 	case GDA_SQL_ANY_STMT_BEGIN:
@@ -356,7 +368,7 @@ static VALUE rb_st_isolation_level(VALUE self)
 {
     GdaSqlStatementTransaction * st;
 
-    Data_Get_Struct(self, GdaSqlStatementTransaction, st);
+    TypedData_Get_Struct(self, GdaSqlStatementTransaction, &any_part_type, st);
 
     switch(st->isolation_level) {
 	default:
@@ -382,7 +394,7 @@ static VALUE rb_st_trans_mode(VALUE self)
 {
     GdaSqlStatementTransaction * st;
 
-    Data_Get_Struct(self, GdaSqlStatementTransaction, st);
+    TypedData_Get_Struct(self, GdaSqlStatementTransaction, &any_part_type, st);
 
     if (st->trans_mode)
 	return rb_str_new2(st->trans_mode);
@@ -394,7 +406,7 @@ static VALUE rb_st_trans_name(VALUE self)
 {
     GdaSqlStatementTransaction * st;
 
-    Data_Get_Struct(self, GdaSqlStatementTransaction, st);
+    TypedData_Get_Struct(self, GdaSqlStatementTransaction, &any_part_type, st);
 
     if (st->trans_name)
 	return rb_str_new2(st->trans_name);
@@ -407,14 +419,14 @@ static VALUE rb_cExpr_value(VALUE self)
     GdaSqlExpr * st;
     GValue * val;
 
-    Data_Get_Struct(self, GdaSqlExpr, st);
+    TypedData_Get_Struct(self, GdaSqlExpr, &any_part_type, st);
 
     val = st->value;
 
     return rb_str_new2(gda_value_stringify(val));
 }
 
-void Init_gda_nodes()
+void Init_gda_nodes(void)
 {
     mNodes = rb_define_module_under(mGDA, "Nodes");
 

data/ext/gda/gda_nodes.h

@@ -1,7 +1,7 @@
 #ifndef _RUBY_GDA_NODES
 #define _RUBY_GDA_NODES
 
-void Init_gda_nodes();
+void Init_gda_nodes(void);
 
 VALUE WrapAnyPart(VALUE stmt, GdaSqlAnyPart *part);
 

data/ext/gda/gda_provider.c

@@ -2,10 +2,22 @@
 
 VALUE cProvider;
 
+static const rb_data_type_t provider_type = {
+    "GDA::SQL::Provider",
+    {
+        NULL,
+        NULL,
+        NULL,
+    },
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 static VALUE name(VALUE self)
 {
     GdaServerProvider * pr;
-    Data_Get_Struct(self, GdaServerProvider, pr);
+    TypedData_Get_Struct(self, GdaServerProvider, &provider_type, pr);
 
     return rb_str_new2(gda_server_provider_get_name(pr));
 }
@@ -18,7 +30,7 @@ static VALUE find(VALUE klass, VALUE string)
     pr = gda_config_get_provider(StringValuePtr(string), &error);
 
     if (pr)
-	return Data_Wrap_Struct(klass, NULL, NULL, pr);
+	return TypedData_Wrap_Struct(klass, &provider_type, pr);
     else {
 	/* FIXME: should actually raise an error here. */
 	g_error_free(error);
@@ -31,27 +43,29 @@ static VALUE parser(VALUE self)
     GdaSqlParser * parser;
     GdaServerProvider * pr;
 
-    Data_Get_Struct(self, GdaServerProvider, pr);
+    TypedData_Get_Struct(self, GdaServerProvider, &provider_type, pr);
 
     parser = gda_server_provider_create_parser(pr, NULL);
 
     if (!parser)
 	rb_raise(rb_eRuntimeError, "zomglol");
 
-    return Data_Wrap_Struct(cParser, NULL, g_object_unref, parser);
+    return gda_parser_wrap(cParser, parser);
 }
 
 static VALUE quote_str(VALUE self, VALUE str)
 {
     GdaServerProvider * pr;
 
-    Data_Get_Struct(self, GdaServerProvider, pr);
+    TypedData_Get_Struct(self, GdaServerProvider, &provider_type, pr);
     return rb_str_new2(gda_sql_identifier_quote(StringValuePtr(str), NULL, pr, TRUE, TRUE));
 }
 
-void Init_gda_provider()
+void Init_gda_provider(void)
 {
+    rb_global_variable(&cProvider);
     cProvider = rb_define_class_under(mSQL, "Provider", rb_cObject);
+
     rb_undef_alloc_func(cProvider);
     rb_define_singleton_method(cProvider, "find", find, 1);
     rb_define_method(cProvider, "name", name, 0);

data/ext/gda/gda_provider.h

@@ -1,7 +1,7 @@
 #ifndef _RUBY_GDA_PROVIDER
 #define _RUBY_GDA_PROVIDER
 
-void Init_gda_provider();
+void Init_gda_provider(void);
 
 #endif
 

data/ext/gda/gda_statement.c

@@ -3,13 +3,33 @@
 VALUE cStatement;
 VALUE cStructure;
 
+static void structure_free(void *data)
+{
+    gda_sql_statement_free((GdaSqlStatement *)data);
+}
+
+static size_t structure_memsize(const void *data)
+{
+    return sizeof(GdaSqlStatement);
+}
+
+static const rb_data_type_t structure_type = {
+    "GDA::SQL::Structure",
+    {
+        NULL,
+        structure_free,
+        structure_memsize,
+    },
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 static VALUE serialize(VALUE self)
 {
-    GdaStatement * stmt;
+    GdaStatement * stmt = gda_statement_unwrap(self);
     gchar * string;
 
-    Data_Get_Struct(self, GdaStatement, stmt);
-
     string = gda_statement_serialize(stmt);
     return rb_str_new2(string);
 }
@@ -17,36 +37,33 @@ static VALUE serialize(VALUE self)
 static VALUE ast(VALUE self)
 {
     GdaSqlStatement * sqlst;
-
-    Data_Get_Struct(self, GdaSqlStatement, sqlst);
-
+    TypedData_Get_Struct(self, GdaSqlStatement, &structure_type, sqlst);
     return WrapAnyPart(self, GDA_SQL_ANY_PART(sqlst->contents));
 }
 
 static VALUE sql(VALUE self)
 {
     GdaSqlStatement * sqlst;
-
-    Data_Get_Struct(self, GdaSqlStatement, sqlst);
-
+    TypedData_Get_Struct(self, GdaSqlStatement, &structure_type, sqlst);
     return rb_str_new2(sqlst->sql);
 }
 
 static VALUE structure(VALUE self)
 {
-    GdaStatement * stmt;
+    GdaStatement * stmt = gda_statement_unwrap(self);
     GdaSqlStatement * sqlst;
 
-    Data_Get_Struct(self, GdaStatement, stmt);
-
     g_object_get(G_OBJECT(stmt), "structure", &sqlst, NULL);
 
-    return Data_Wrap_Struct(cStructure, NULL, gda_sql_statement_free, sqlst);
+    return TypedData_Wrap_Struct(cStructure, &structure_type, sqlst);
 }
 
-void Init_gda_statement()
+void Init_gda_statement(void)
 {
+    rb_global_variable(&cStatement);
     cStatement = rb_define_class_under(mSQL, "Statement", rb_cObject);
+
+    rb_global_variable(&cStructure);
     cStructure = rb_define_class_under(mSQL, "Structure", rb_cObject);
 
     rb_undef_alloc_func(cStatement);

data/ext/gda/gda_statement.h

@@ -1,6 +1,6 @@
 #ifndef _RUBY_GDA_STATEMENT
 #define _RUBY_GDA_STATEMENT
 
-void Init_gda_statement();
+void Init_gda_statement(void);
 
 #endif

data/lib/gda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GDA
-  VERSION = '1.1.3'
+  VERSION = '1.1.5'
 end

data/lib/gda/visitors/dot.rb

@@ -32,19 +32,19 @@ module GDA
         @buffer.printf(*args)
       end
 
-      NODE = ERB.new <<-eoerb
-node<%= node.object_id %> [shape="plaintext" label=<
-<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="4">
-<TR><TD COLSPAN="2"><%= node.class %></TD></TR>
-<% attrs.each do |attr| %>
-  <% next if node.send(attr).nil? %>
-  <TR><TD><%= ERB::Util.h attr %></TD><TD><%= ERB::Util.h node.send(attr) %></TD></TR>
-<% end %>
-</TABLE>>];
+      NODE = ERB.new <<~eoerb
+        node<%= node.object_id %> [shape="plaintext" label=<
+        <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="4">
+        <TR><TD COLSPAN="2"><%= node.class %></TD></TR>
+        <% attrs.each do |attr| %>
+          <% next if node.send(attr).nil? %>
+          <TR><TD><%= ERB::Util.h attr %></TD><TD><%= ERB::Util.h node.send(attr) %></TD></TR>
+        <% end %>
+        </TABLE>>];
       eoerb
 
-      LIST = ERB.new <<-eoerb
-node<%= node.object_id %> [shape="invhouse", color=gray, fontcolor=gray, label=list];
+      LIST = ERB.new <<~eoerb
+        node<%= node.object_id %> [shape="invhouse", color=gray, fontcolor=gray, label=list];
       eoerb
 
       def add_node node, attrs = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gda
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Aaron Patterson
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: An SQL parser